fix testcase workarounds