Modified some of the tests