New wrappers

Use an ellipsis if it makes sense. https://docs.python.org/2/library/doctest.html#doctest.ELLIPSIS