Fix failing tests in master caused by version bump