Fixed more doctests