Refs #75. Added more doctests