Fix failing tests on CI