Minor fixes to the test files.