Added and fixed doctests