added canvas test support
Merge branch 'canvas' into 0.0.x