Fix test files after reorg