refactor merge all test files