Updated doctests