combined the two test files