Reorganized testfiles