diff --git a/src/imageloader.js b/src/imageloader.js
index 9d04ed2b..ab038a13 100644
--- a/src/imageloader.js
+++ b/src/imageloader.js
@@ -120,6 +120,9 @@ $.ImageJob.prototype = {
      * @memberof OpenSeadragon.ImageJob#
      */
     finish: function(data, request, dataType) {
+        if (!this.jobId) {
+            return;
+        }
         // old behavior, no deprecation due to possible finish calls with invalid data item (e.g. different error)
         if (data === null || data === undefined || data === false) {
             this.fail(dataType || "[downloadTileStart->finish()] Retrieved data is invalid!", request);
@@ -151,6 +154,7 @@ $.ImageJob.prototype = {
 
         if (this.jobId) {
             window.clearTimeout(this.jobId);
+            this.jobId = null;
         }
 
         this.callback(this);
diff --git a/src/tiledimage.js b/src/tiledimage.js
index 7992ee57..98c976b1 100644
--- a/src/tiledimage.js
+++ b/src/tiledimage.js
@@ -923,13 +923,13 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
         this.flipped = flip;
     },
 
-    get flipped(){
+    get flipped() {
         return this._flipped;
     },
-    set flipped(flipped){
+    set flipped(flipped) {
         let changed = this._flipped !== !!flipped;
         this._flipped = !!flipped;
-        if(changed){
+        if (changed && this._initialized) {
             this.update(true);
             this._needsDraw = true;
             this._raiseBoundsChange();
diff --git a/test/demo/constrainedpan.html b/test/demo/constrainedpan.html
index 1cd7578a..0c594463 100644
--- a/test/demo/constrainedpan.html
+++ b/test/demo/constrainedpan.html
@@ -41,8 +41,9 @@
             constrainDuringPan: true,
             visibilityRatio: 1,
             prefixUrl: "../../build/openseadragon/images/",
-            minZoomImageRatio: 1
+            minZoomImageRatio: 1,
+            crossOriginPolicy: 'Anonymous',
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/demo/item-animation.html b/test/demo/item-animation.html
index 254458a6..19bcd129 100644
--- a/test/demo/item-animation.html
+++ b/test/demo/item-animation.html
@@ -59,7 +59,8 @@
                     this.viewer = OpenSeadragon({
                         id: "contentDiv",
                         prefixUrl: "../../build/openseadragon/images/",
-                        tileSources: tileSources
+                        tileSources: tileSources,
+                        crossOriginPolicy: 'Anonymous',
                     });
 
                     this.viewer.addHandler('open', function() {
diff --git a/test/demo/layers.html b/test/demo/layers.html
index c4777f55..ce25ff1d 100644
--- a/test/demo/layers.html
+++ b/test/demo/layers.html
@@ -109,14 +109,14 @@
                     opacity: getOpacity( layerName )
                 };
                 var addLayerHandler = function( event ) {
-                    if ( event.options === options ) {
-                        viewer.removeHandler( "add-layer", addLayerHandler );
-                        layers[layerName] = event.drawer;
+                    if ( event.item.source.levels[0].url.includes(layerName) ) {
+                        viewer.world.removeHandler( "add-item", addLayerHandler );
+                        layers[layerName] = event.item;
                         updateOrder();
                     }
                 };
-                viewer.addHandler( "add-layer", addLayerHandler );
-                viewer.addLayer( options );
+                viewer.world.addHandler( "add-item", addLayerHandler );
+                viewer.addTiledImage( options );
             }
 
             function left() {
@@ -146,13 +146,15 @@
             }
 
             function updateOrder() {
-                var nbLayers = viewer.getLayersCount();
+                var nbLayers = viewer.world.getItemCount();
                 if ( nbLayers < 2 ) {
                     return;
                 }
                 $.each( $( "#used select option" ), function( index, value ) {
                     var layer = value.innerHTML;
-                    viewer.setLayerLevel( layers[layer], nbLayers -1 - index );
+                    if (layers[layer]) {
+                        viewer.world.setItemIndex( layers[layer], nbLayers -1 - index );
+                    }
                 } );
             }
 
diff --git a/test/demo/max-tiles-per-frame.html b/test/demo/max-tiles-per-frame.html
index 2c2bad9b..6e43203d 100644
--- a/test/demo/max-tiles-per-frame.html
+++ b/test/demo/max-tiles-per-frame.html
@@ -26,7 +26,7 @@
             prefixUrl: "../../build/openseadragon/images/",
             tileSources:  "https://openseadragon.github.io/example-images/duomo/duomo.dzi",
             showNavigator:true,
-            debugMode:true,
+            crossOriginPolicy: 'Anonymous',
             maxTilesPerFrame:3,
         });
 
diff --git a/test/demo/timeout-certain.html b/test/demo/timeout-certain.html
index 9e177500..e5f4bde1 100644
--- a/test/demo/timeout-certain.html
+++ b/test/demo/timeout-certain.html
@@ -25,8 +25,9 @@
         // debugMode: true,
         id: "contentDiv",
         prefixUrl: "../../build/openseadragon/images/",
-        tileSources: "http://wellcomelibrary.org/iiif-img/b11768265-0/a6801943-b8b4-4674-908c-7d5b27e70569/info.json",
+        tileSources: "https://openseadragon.github.io/example-images/highsmith/highsmith.dzi",
         showNavigator:true,
+        crossOriginPolicy: 'Anonymous',
         timeout: 0
     });
 
diff --git a/test/demo/timeout-unlikely.html b/test/demo/timeout-unlikely.html
index 284f4297..dbf46d33 100644
--- a/test/demo/timeout-unlikely.html
+++ b/test/demo/timeout-unlikely.html
@@ -25,8 +25,9 @@
         // debugMode: true,
         id: "contentDiv",
         prefixUrl: "../../build/openseadragon/images/",
-        tileSources: "http://wellcomelibrary.org/iiif-img/b11768265-0/a6801943-b8b4-4674-908c-7d5b27e70569/info.json",
+        tileSources: "https://openseadragon.github.io/example-images/highsmith/highsmith.dzi",
         showNavigator:true,
+        crossOriginPolicy: 'Anonymous',
         timeout: 1000 * 60 * 60 * 24
     });