doctest fix and fixup for previous commit

Change-Id: Iea8fef0bd4a683a33bb97c0a2a0abca3bd5e5d9a
Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>