Organizing tests
Merge branch 'wrangler_sbl' of github.com:RefactoringTools/wrangler into wrangler_sbl

Merging