There were some failing tests.

This was missed in a recent bug fix commit.
Not a red flag. Just needs a mock/spy change.
Small code cleanup (tabbing alignment, odd chars at end of lines).