Made some minor modifications to test files