Fix failing tests on this branch