reorg test files