changed a few test aroundd