Fix failing testsuite