Updated the rest of the tests