Reorganized test file