refactor test files