consolidated the test files