Trying to fix the tests