General development. Improve testsuite.