more cleanup of canvas-test