Issue #92. New tests for cairo.
Issue #92. Include draw functions in Header.
Issue #92 Minor Corrections.