Restructured test cases