Finally fix the tests on the server