Fix failing tests in develop