Corrected testsuite