proper reorg handling on initial load, with unit test