Fixed oldfashioned testsuite