diff --git a/google-map.html b/google-map.html
index 9bc96f8..c01c3a5 100644
--- a/google-map.html
+++ b/google-map.html
@@ -431,7 +431,7 @@
         return;
       }
       this._mutationObserver = new MutationObserver( this._updateMarkers.bind(this));
-      this._mutationObserver.observe(this, {
+      this._mutationObserver.observe(this.$.selector, {
         childList: true
       });
     },
diff --git a/test/google-map-basic.html b/test/google-map-basic.html
index a69df5d..e9bf2ce 100644
--- a/test/google-map-basic.html
+++ b/test/google-map-basic.html
@@ -12,7 +12,7 @@
 
   <google-map id="map1"></google-map>
   <google-map id="map2" latitude="37.555" longitude="-122.555"></google-map>
-  <google-map id="map3" disable-zoom zoom="11" min-zoom="10" max-zoom="11" no-auto-tilt fit-to-markers></google-map>
+  <google-map id="map3" disable-zoom zoom="11" min-zoom="10" max-zoom="11" no-auto-tilt fit-to-markers single-info-window></google-map>
 
   <div id='newmap'>
   </div>
@@ -65,6 +65,7 @@
     assert.isUndefined(map.maxZoom);
     assert.isUndefined(map.minZoom);
     assert.isFalse(map.disableZoom);
+    assert.isFalse(map.singleInfoWindow);
     assert.equal(map.latitude, 37.77493);
     assert.equal(map.longitude, -122.41942);
     assert.equal(map.mapType, 'roadmap');
@@ -78,6 +79,7 @@
       assert.equal(map3.maxZoom, map3.map.maxZoom);
       assert.equal(map3.minZoom, map3.map.minZoom);
       assert.isTrue(map3.disableZoom);
+      assert.isTrue(map3.singleInfoWindow);
 
       done();
     });
diff --git a/test/marker-basic.html b/test/marker-basic.html
index fc69192..3e58623 100644
--- a/test/marker-basic.html
+++ b/test/marker-basic.html
@@ -44,6 +44,7 @@
     assert.equal(markerEl.zIndex, 0);
     assert.equal(markerEl.latitude, 37.779);
     assert.equal(markerEl.longitude, -122.3892);
+    assert.isFalse(markerEl.open);
     assert.isNull(markerEl.offsetParent,
                   'google-map-marker should be display: none');
   });