Try to fix the tests