Reorganized test files.