Reorganized test folders