Update TestCase with QueryTestCase