Doctests fixed