reorg test packages