fixup! Bug #2875: unit tests and better comment