Reorg test/ and remove some old files