reorg test suite