Fixes for the testsuite