Failing tests proving #86 is a problem (+ more)
Document a stupid braino I ran into
Fix up tests + implementation re #86
Changelog re #86