Fixed some bugs

not testing in rock, cutting off the tests, cutting off the location
coordinates