More changes to test files