Updates to the tests