minor test reorg