Fixing the tests (I think)