reorg test folders to match core