Fixes for testsuite