Attempt to fix testcase failures.