partial reorg, tests passing