Reorg unit tests