Revamp canvases tests and fix a few bug in Canvases class