Fixing the tests
We now need this, for some unknown bizarre reason