merge other test files