Fix tests on testcase infrastructure