More test files updated