Modified some more test files.