tests directory reorg