reorganize testsuite