Updated some test-related files.