Fix tests in testsuite