reorganizing tests