Fix Tk #26

This also adds a test for drawing directly to a canvas