Finish up testing reorg