Restructured test cases.