It will take some time to fix the tests :)