Changed some of the tests to be more clear