yet another tests directory re-organization