Improved testsuite structure.