reorganizing testing