unit tests reorg