Updated the tests too