Changing some of the tests