refactored test files