more fixes for testsuite