reorganizes and streamlines tests