reorg unittests