diff --git a/src/canvasdrawer.js b/src/canvasdrawer.js
index e91a0459..b63c2ed0 100644
--- a/src/canvasdrawer.js
+++ b/src/canvasdrawer.js
@@ -101,6 +101,24 @@ class CanvasDrawer extends $.DrawerBase{
                 this._drawTiles(tiledImage);
             }
         }
+
+        // // Fire the frame-drawn event.
+        // if( this.viewer ){
+        //     /**
+        //         * Raised when a tiled image is drawn to the canvas. Only valid
+        //         * for webgl and canvas drawers.
+        //         *
+        //         * @event tiled-image-drawn
+        //         * @memberof OpenSeadragon.Viewer
+        //         * @type {object}
+        //         * @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised the event.
+        //         * @property {HTMLElement} canvas - The canvas which has been drawn onto
+        //         * @property {?Object} userData - Arbitrary subscriber-defined object.
+        //         */
+        //     this.viewer.raiseEvent( 'frame-drawn', {
+        //         canvas: this.canvas
+        //     });
+        // }
     }
 
     /**
diff --git a/src/webgldrawer.js b/src/webgldrawer.js
index c0bff511..90e802d4 100644
--- a/src/webgldrawer.js
+++ b/src/webgldrawer.js
@@ -380,6 +380,24 @@
                 this._outputContext.drawImage(this._renderingCanvas, 0, 0);
             }
 
+            // // Fire the frame-drawn event.
+            // if( this.viewer ){
+            //     /**
+            //         * Raised when a tiled image is drawn to the canvas. Only valid
+            //         * for webgl and canvas drawers.
+            //         *
+            //         * @event tiled-image-drawn
+            //         * @memberof OpenSeadragon.Viewer
+            //         * @type {object}
+            //         * @property {OpenSeadragon.Viewer} eventSource - A reference to the Viewer which raised the event.
+            //         * @property {HTMLElement} canvas - The canvas which has been drawn onto
+            //         * @property {?Object} userData - Arbitrary subscriber-defined object.
+            //         */
+            //     this.viewer.raiseEvent( 'frame-drawn', {
+            //         canvas: this.canvas
+            //     });
+            // }
+
         }
 
         // Public API required by all Drawer implementations
diff --git a/test/demo/basic.html b/test/demo/basic.html
index 5f4262ab..5f956673 100644
--- a/test/demo/basic.html
+++ b/test/demo/basic.html
@@ -20,16 +20,6 @@
     <div id="contentDiv" class="openseadragon1"></div>
     <script type="text/javascript">
 
-        const url = new URL(window.location.href);
-        let drawer = url.searchParams.get("drawer");
-        if (!drawer) {
-            drawer = 'canvas';
-            url.searchParams.set('drawer', drawer);
-            if ("undefined" !== typeof history.replaceState) {
-                history.replaceState(null, window.location.title, url.toString());
-            }
-        }
-
         var viewer = OpenSeadragon({
             // debugMode: true,
             id: "contentDiv",
diff --git a/test/demo/collections/main.js b/test/demo/collections/main.js
index 0806bedc..3e6d2169 100644
--- a/test/demo/collections/main.js
+++ b/test/demo/collections/main.js
@@ -131,7 +131,8 @@
                     var box = new OpenSeadragon.Rect(margins.left, margins.top,
                         $('#contentDiv').width() - (margins.left + margins.right),
                         $('#contentDiv').height() - (margins.top + margins.bottom));
-                    // if drawDebuggingRect is implemented, use it to show the box
+                    // If drawDebuggingRect is implemented, use it to show the box.
+                    // This is not implemented by all drawers however.
                     self.viewer.drawer.drawDebuggingRect(box);
                 });
             }
diff --git a/test/demo/tilesource-swap.html b/test/demo/tilesource-swap.html
index 176ffbf7..5b1f6dee 100644
--- a/test/demo/tilesource-swap.html
+++ b/test/demo/tilesource-swap.html
@@ -80,12 +80,12 @@
                             // The changeover will look better if we wait for the first tile to be drawn.
                             var tileDrawnHandler = function(event) {
                                 if (event.tiledImage === fullImage) {
-                                    viewer.removeHandler('tiled-image-drawn', tileDrawnHandler);
+                                    viewer.removeHandler('update-viewport', tileDrawnHandler);
                                     viewer.world.removeItem(standin);
                                 }
                             };
 
-                            viewer.addHandler('tiled-image-drawn', tileDrawnHandler);
+                            viewer.addHandler('update-viewport', tileDrawnHandler);
                         }
                     });
                 }
diff --git a/test/modules/ajax-tiles.js b/test/modules/ajax-tiles.js
index 68e5ab16..fc0b0545 100644
--- a/test/modules/ajax-tiles.js
+++ b/test/modules/ajax-tiles.js
@@ -53,10 +53,7 @@
             });
         },
         afterEach: function() {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/basic.js b/test/modules/basic.js
index 2418e5b6..bf2fc077 100644
--- a/test/modules/basic.js
+++ b/test/modules/basic.js
@@ -16,10 +16,7 @@
             });
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/controls.js b/test/modules/controls.js
index 35fef74c..7e774d9b 100644
--- a/test/modules/controls.js
+++ b/test/modules/controls.js
@@ -19,9 +19,6 @@
             if (viewer && viewer.close) {
                 viewer.close();
             }
-            // if (viewer && viewer.destroy){
-            //     viewer.destroy();
-            // }
 
             viewer = null;
         }
diff --git a/test/modules/drawer.js b/test/modules/drawer.js
index ad953080..85de0929 100644
--- a/test/modules/drawer.js
+++ b/test/modules/drawer.js
@@ -10,10 +10,7 @@
             testLog.reset();
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
             viewer = null;
diff --git a/test/modules/events.js b/test/modules/events.js
index 65ca9391..6b033ba9 100644
--- a/test/modules/events.js
+++ b/test/modules/events.js
@@ -17,10 +17,7 @@
             } );
         },
         afterEach: function () {
-            if ( viewer && viewer.close ) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/formats.js b/test/modules/formats.js
index a41ee49b..6b5c7fb6 100644
--- a/test/modules/formats.js
+++ b/test/modules/formats.js
@@ -14,10 +14,7 @@
             document.getElementById("qunit-fixture").appendChild(example);
         },
         afterEach: function () {
-            if ( viewer && viewer.close ) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/imageloader.js b/test/modules/imageloader.js
index 12842dfd..7a7d6768 100644
--- a/test/modules/imageloader.js
+++ b/test/modules/imageloader.js
@@ -15,10 +15,7 @@
             testLog.reset();
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/multi-image.js b/test/modules/multi-image.js
index 38ab9e4c..c1a45944 100644
--- a/test/modules/multi-image.js
+++ b/test/modules/multi-image.js
@@ -16,10 +16,7 @@
             });
         },
         afterEach: function() {
-            if ( viewer && viewer.close ) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/navigator.js b/test/modules/navigator.js
index ab1be8d3..cb5c425f 100644
--- a/test/modules/navigator.js
+++ b/test/modules/navigator.js
@@ -42,10 +42,7 @@
 
             resetTestVariables();
 
-            // if ( viewer && viewer.close ) {
-            //     viewer.close();
-            // }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/overlays.js b/test/modules/overlays.js
index bafc0d35..613c0de3 100644
--- a/test/modules/overlays.js
+++ b/test/modules/overlays.js
@@ -16,10 +16,8 @@
         },
         afterEach: function() {
             resetTestVariables();
-            if ( viewer && viewer.close ) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/referencestrip.js b/test/modules/referencestrip.js
index 25ae1b9b..86e0c5ee 100644
--- a/test/modules/referencestrip.js
+++ b/test/modules/referencestrip.js
@@ -10,10 +10,7 @@
             testLog.reset();
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/tiledimage.js b/test/modules/tiledimage.js
index a322ae6b..b2af3066 100644
--- a/test/modules/tiledimage.js
+++ b/test/modules/tiledimage.js
@@ -17,10 +17,7 @@
             });
         },
         afterEach: function() {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/tilesource-dynamic-url.js b/test/modules/tilesource-dynamic-url.js
index d490ee6e..c6c7fe94 100644
--- a/test/modules/tilesource-dynamic-url.js
+++ b/test/modules/tilesource-dynamic-url.js
@@ -130,10 +130,7 @@
         afterEach: function () {
             ASSERT = null;
 
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/units.js b/test/modules/units.js
index 160cea35..e1190603 100644
--- a/test/modules/units.js
+++ b/test/modules/units.js
@@ -19,10 +19,7 @@
             });
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/viewport.js b/test/modules/viewport.js
index c805945e..995447bd 100644
--- a/test/modules/viewport.js
+++ b/test/modules/viewport.js
@@ -21,10 +21,7 @@
             });
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }
 
diff --git a/test/modules/world.js b/test/modules/world.js
index a4c3990f..49253fd5 100644
--- a/test/modules/world.js
+++ b/test/modules/world.js
@@ -16,10 +16,7 @@
             });
         },
         afterEach: function () {
-            if (viewer && viewer.close) {
-                viewer.close();
-            }
-            if (viewer && viewer.destroy){
+            if (viewer){
                 viewer.destroy();
             }