tidy up doctest some more