Restructured test file