Reorg of tests.