Minor organizational changes to test files.