More testcase updates