More changes for the tests