Improved testsuite structure.
Fixed tests.