Minor unit test reorg