Updated testcase structure