diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js
index a701f6433..dd03368c3 100755
--- a/js/iD/renderer/Map.js
+++ b/js/iD/renderer/Map.js
@@ -76,10 +76,6 @@ iD.Map = function(elem) {
     // strokes, and so on.
     var surface = parent.append('svg')
         .call(zoombehavior);
-        // .call(clickCancel);
-
-    // Don't use the default double click handler.
-    // surface.on('dblclick.zoom', null);
 
     surface.append('defs').append('clipPath')
         .attr('id', 'clip')
@@ -326,8 +322,7 @@ iD.Map = function(elem) {
     }
 
     function getZoom(zoom) {
-        var s = projection.scale();
-        return Math.max(Math.log(s) / Math.log(2) - 7, 0);
+        return Math.max(Math.log(projection.scale()) / Math.log(2) - 7, 0);
     }
 
     function setZoom(zoom) {
diff --git a/test/index.html b/test/index.html
index 3b963eb5a..ae869158e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -14,6 +14,7 @@
   <script type="text/javascript" src="../js/lib/d3.v2.min.js"></script>
   <script type="text/javascript" src="../js/iD/id.js"></script>
   <script type="text/javascript" src="../js/iD/Util.js"></script>
+  <script type="text/javascript" src="../js/iD/format/format.js"></script>
   <script type="text/javascript" src="../js/iD/format/GeoJSON.js"></script>
   <script type="text/javascript" src="../js/iD/Connection.js"></script>
 
@@ -26,7 +27,8 @@
   <script type="text/javascript" src="../js/iD/renderer/Map.js"></script>
   <script type="text/javascript" src="../js/iD/renderer/Style.js"></script>
   <script type="text/javascript" src="../js/iD/renderer/tiles.js"></script>
-  <script type="text/javascript" src="../js/iD/Graph.js"></script>
+  <script type="text/javascript" src="../js/iD/graph/Graph.js"></script>
+  <script type="text/javascript" src="../js/iD/graph/History.js"></script>
 
   <!-- include spec files here... -->
   <script type="text/javascript" src="spec/Util.js"></script>
diff --git a/test/spec/GeoJSON.js b/test/spec/GeoJSON.js
index b60fff7d3..e048dc193 100644
--- a/test/spec/GeoJSON.js
+++ b/test/spec/GeoJSON.js
@@ -2,11 +2,11 @@ describe('GeoJSON', function() {
 
   describe('#mapping', function() {
       it('should be able to map a node to geojson', function() {
-          expect(iD.GeoJSON.mapping({ type: 'node', lat: 38, lon: -77 }).geometry.type).toEqual('Point');
+          expect(iD.format.GeoJSON.mapping({ type: 'node', lat: 38, lon: -77 }).geometry.type).toEqual('Point');
       });
       it('should be able to map a way to geojson', function() {
           var way = { type: 'way', nodes: [] };
-          var gj = iD.GeoJSON.mapping(way);
+          var gj = iD.format.GeoJSON.mapping(way);
           expect(gj.type).toEqual('Feature');
           expect(gj.geometry.type).toEqual('LineString');
       });
diff --git a/test/spec/Way.js b/test/spec/Way.js
index c41855f52..bd04d73cb 100644
--- a/test/spec/Way.js
+++ b/test/spec/Way.js
@@ -2,7 +2,7 @@ describe('Way', function() {
   var way;
 
   beforeEach(function() {
-      way = { type: 'way', nodes: ['n1', 'n2'] };
+      way = { type: 'way', nodes: [{id: 'n1'}, {id: 'n2'}] };
   });