more of the test reorg