test file organization
small refactoring