test cleanup, address unscoped variables#2551

zspitzer wants to merge 2 commits intolucee:7.0lucee/Lucee:7.0from

zspitzer:mega-test-scope-cleanupzspitzer/Lucee:mega-test-scope-cleanupCopy head branch name to clipboard