Restructured test files