Updates to controller and added tests for canvas.