More collection test reorg