Updated canvastest