Fix tests
Doctests