More changes for trying run the tests