Fixed a few problems in the test files.