improved testsuite