diff --git a/test/modules/tiledimage.js b/test/modules/tiledimage.js
new file mode 100644
index 00000000..72f9a728
--- /dev/null
+++ b/test/modules/tiledimage.js
@@ -0,0 +1,141 @@
+/* global module, asyncTest, $, ok, equal, notEqual, start, test, Util, testLog */
+
+(function() {
+    var viewer;
+
+    module('TiledImage', {
+        setup: function () {
+            var example = $('<div id="example"></div>').appendTo("#qunit-fixture");
+
+            testLog.reset();
+
+            viewer = OpenSeadragon({
+                id:            'example',
+                prefixUrl:     '/build/openseadragon/images/',
+                springStiffness: 100 // Faster animation = faster tests
+            });
+        },
+        teardown: function () {
+            if (viewer && viewer.close) {
+                viewer.close();
+            }
+
+            viewer = null;
+        }
+    });
+
+    // ----------
+    var checkBounds = function(image, expected, message) {
+        var bounds = image.getBounds();
+        equal(bounds.x, expected.x, message + ' x');
+        equal(bounds.y, expected.y, message + ' y');
+        equal(bounds.width, expected.width, message + ' width');
+        equal(bounds.height, expected.height, message + ' height');
+    };
+
+    // ----------
+    asyncTest('metrics', function() {
+        var handlerCount = 0;
+
+        viewer.addHandler('open', function(event) {
+            var image = viewer.world.getItemAt(0);
+            var contentSize = image.getContentSize();
+            equal(contentSize.x, 500, 'contentSize.x');
+            equal(contentSize.y, 2000, 'contentSize.y');
+
+            checkBounds(image, new OpenSeadragon.Rect(5, 6, 10, 40), 'initial bounds');
+
+            image.addHandler('bounds-change', function boundsChangeHandler(event) {
+                image.removeHandler('bounds-change', boundsChangeHandler);
+                handlerCount++;
+            });
+
+            image.setPosition(new OpenSeadragon.Point(7, 8));
+            checkBounds(image, new OpenSeadragon.Rect(7, 8, 10, 40), 'bounds after position');
+
+            image.setWidth(5);
+            checkBounds(image, new OpenSeadragon.Rect(7, 8, 5, 20), 'bounds after width');
+
+            image.setHeight(4);
+            checkBounds(image, new OpenSeadragon.Rect(7, 8, 1, 4), 'bounds after width');
+
+            equal(handlerCount, 1, 'correct number of handlers called');
+            start();
+        });
+
+        viewer.open({
+            tileSource: '/test/data/tall.dzi',
+            x: 5,
+            y: 6,
+            width: 10
+        });
+    });
+
+    // ----------
+    asyncTest('update', function() {
+        var handlerCount = 0;
+
+        viewer.addHandler('open', function(event) {
+            var image = viewer.world.getItemAt(0);
+            equal(image.needsUpdate(), true, 'needs update after open');
+
+            viewer.addHandler('update-level', function updateLevelHandler(event) {
+                viewer.removeHandler('update-level', updateLevelHandler);
+                handlerCount++;
+                equal(event.eventSource, viewer, 'sender of update-level event was viewer');
+                ok('havedrawn' in event, 'update-level event includes havedrawn');
+                ok('level' in event, 'update-level event includes level');
+                ok('opacity' in event, 'update-level event includes opacity');
+                ok('visibility' in event, 'update-level event includes visibility');
+                ok('topleft' in event, 'update-level event includes topleft');
+                ok('bottomright' in event, 'update-level event includes bottomright');
+                ok('currenttime' in event, 'update-level event includes currenttime');
+                ok('best' in event, 'update-level event includes best');
+            });
+
+            viewer.addHandler('update-tile', function updateTileHandler(event) {
+                viewer.removeHandler('update-tile', updateTileHandler);
+                handlerCount++;
+                equal(event.eventSource, viewer, 'sender of update-tile event was viewer');
+                ok(event.tile, 'update-tile event includes tile');
+            });
+
+            viewer.addHandler('tile-drawn', function tileDrawnHandler(event) {
+                viewer.removeHandler('tile-drawn', tileDrawnHandler);
+                handlerCount++;
+                equal(event.eventSource, viewer, 'sender of tile-drawn event was viewer');
+                ok(event.tile, 'tile-drawn event includes tile');
+
+                equal(handlerCount, 3, 'correct number of handlers called');
+                start();
+            });
+
+            image.update();
+        });
+
+        viewer.open('/test/data/testpattern.dzi');
+    });
+
+    // ----------
+    asyncTest('reset', function() {
+        viewer.addHandler('tile-drawn', function updateHandler() {
+            viewer.removeHandler('tile-drawn', updateHandler);
+            ok(viewer.tileCache.numTilesLoaded() > 0, 'we have tiles after tile-drawn');
+            viewer.world.getItemAt(0).reset();
+            equal(viewer.tileCache.numTilesLoaded(), 0, 'no tiles after reset');
+
+            viewer.addHandler('tile-drawn', function updateHandler2() {
+                viewer.removeHandler('tile-drawn', updateHandler2);
+                ok(viewer.tileCache.numTilesLoaded() > 0, 'more tiles load');
+                viewer.world.getItemAt(0).destroy();
+                equal(viewer.tileCache.numTilesLoaded(), 0, 'no tiles after destroy');
+                start();
+            });
+        });
+
+        equal(viewer.tileCache.numTilesLoaded(), 0, 'no tiles at start');
+
+        viewer.open('/test/data/testpattern.dzi');
+    });
+
+})();