improving testsuite