Reorg tests a bit