Code reorg. Testsuite.