further adjust of test files