Reorganize test files