fixup! Bug #4902: Unit tests