Final changes to the tests