Add new version of Canvas, Add CanvasTest

Previous Canvas became CanvasTest. A new Canvas has been added.