Fixed a few more bugs in the test files.