I just spent a few hours trying to fix failing tests after a change...