What about trying to fix the tests ?