Updating the tests too