restructured test cases