I broke this whole section down into a pair of extra methods (copy-pasted the code) just to try and limit the amount of testing even further.  Functionally it's the same, but it's a bit easier on the eyes (and my old-brain) and it gave me places to stick in extra docstrings (did I mention I like documentation?).