Fix testsuite wibbles