Fixed testsuite