Doctest runner fixes