The diff is pretty unhelpful here. What happened was I removed the "way too monolithic" test, and refactored it into 3 smaller tests and some helpers, below.