Update test files to fix test failures.