diff --git a/scripts/mocha_runner.js b/scripts/mocha_runner.js
index 22a61a35..23258251 100644
--- a/scripts/mocha_runner.js
+++ b/scripts/mocha_runner.js
@@ -56,7 +56,8 @@ const google = {
     },
     Marker: function() {
       return {
-        addListener: function() {}
+        addListener: function() {},
+        setMap: function() {}
       };
     },
     MarkerImage: function() {
diff --git a/src/index.js b/src/index.js
index 2e8f1beb..85d370f4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,7 +19,28 @@ const mapStyles = {
   }
 }
 
-const evtNames = ['ready', 'click', 'dragend', 'recenter'];
+const evtNames = [
+  'ready',
+  'click',
+  'dragend',
+  'recenter',
+  'bounds_changed',
+  'center_changed',
+  'dblclick',
+  'dragstart',
+  'heading_change',
+  'idle',
+  'maptypeid_changed',
+  'mousemove',
+  'mouseout',
+  'mouseover',
+  'projection_changed',
+  'resize',
+  'rightclick',
+  'tilesloaded',
+  'tilt_changed',
+  'zoom_changed'
+];
 
 export {wrapper as GoogleApiWrapper} from './GoogleApiComponent'
 export {Marker} from './components/Marker'