diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index b3445cba5afa296ed04d3b33a3d1618c2dc628d7..25f134c53116c68a05bae304990e01496374bad9 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -716,20 +716,6 @@ CustomMap.prototype.refreshInfoWindows = function () {
   return Promise.all(promises);
 };
 
-/**
- * Opens {@link AliasInfoWindow} for an {@link Alias}.
- *
- * @param {Alias} alias
- * @param {Marker} marker
- *
- * @returns {PromiseLike}
- */
-CustomMap.prototype.openInfoWindowForAlias = function (alias, marker) {
-  logger.debug("Opening info window for alias: " + alias.getId() + ", model: " + alias.getModelId());
-  var submap = this.getSubmapById(alias.getModelId());
-  return submap._openInfoWindowForAlias(alias, marker);
-};
-
 /**
  * Renders markers, lines, etc. for elements highlighted in OverlayCollection.
  *
diff --git a/frontend-js/src/test/js/map/AbstractCustomMap-test.js b/frontend-js/src/test/js/map/AbstractCustomMap-test.js
index 394f36cbc4d035860a850052d84a08c2a73a734a..642c1db6c89157026254be9ad75846470a958b47 100644
--- a/frontend-js/src/test/js/map/AbstractCustomMap-test.js
+++ b/frontend-js/src/test/js/map/AbstractCustomMap-test.js
@@ -4,7 +4,6 @@ var Promise = require("bluebird");
 require("../mocha-config");
 
 var AliasMarker = require('../../../main/js/map/marker/AliasMarker');
-var AliasSurface = require('../../../main/js/map/surface/AliasSurface');
 var AbstractCustomMap = require('../../../main/js/map/AbstractCustomMap');
 var IdentifiedElement = require('../../../main/js/map/data/IdentifiedElement');
 var Point = require('../../../main/js/map/canvas/Point');
@@ -28,7 +27,7 @@ describe('AbstractCustomMap', function () {
     assert.ok(mockObject.getSelectedLayoutOverlays());
 
     assert.equal(mockObject.getAliasInfoWindowById(-1), null);
-    assert.equal(mockObject.getPointInfoWindowById(-1), null);
+    assert.equal(mockObject.getPointInfoWindowById("-1"), null);
     assert.equal(mockObject.getReactionInfoWindowById(-1), null);
 
     assert.equal(logger.getWarnings().length, 0);
@@ -102,6 +101,49 @@ describe('AbstractCustomMap', function () {
 
   });
 
+  describe("_openInfoWindowForAlias", function () {
+    it("default", function () {
+      var map = helper.createCustomMap();
+      var layout = helper.createOverlay();
+      var alias = helper.createAlias();
+      alias.setModelId(map.getId());
+      var layoutAlias = helper.createLayoutAlias();
+      layoutAlias.setId(alias.getId());
+
+      layout.addAlias(layoutAlias);
+
+      // create layout
+      map.getProject().addDataOverlay(layout, false);
+      map.getModel().addAlias(alias);
+      return map.init().then(function () {
+        var marker = map.getMapCanvas().createMarker({position: new Point(0, 0), icon: "empty.png"});
+
+        return map._openInfoWindowForAlias(alias, marker);
+      }).then(function () {
+        assert.ok(map.getAliasInfoWindowById(alias.getId()));
+        assert.ok(map.getAliasInfoWindowById(alias.getId()).isOpened());
+      });
+    });
+
+    it("for incomplete alias", function () {
+      var map, alias;
+      return ServerConnector.getProject().then(function (project) {
+        map = helper.createCustomMap(project);
+
+        return map.getModel().getAliasById(329171, false);
+      }).then(function (result) {
+        var marker = map.getMapCanvas().createMarker({position: new Point(0, 0), icon: "empty.png"});
+        alias = result;
+        assert.notOk(alias.isComplete());
+        return map._openInfoWindowForAlias(alias, marker);
+      }).then(function () {
+        assert.ok(map.getAliasInfoWindowById(alias.getId()));
+        assert.ok(map.getAliasInfoWindowById(alias.getId()).isOpened());
+      });
+    });
+  });
+
+
   it("getDebug", function () {
     var map = helper.createAbstractCustomMap();
     map.setDebug(true);
@@ -112,11 +154,6 @@ describe('AbstractCustomMap', function () {
     it("alias", function () {
       var map = helper.createCustomMap();
       var alias = helper.createAlias(map);
-      var ie = new IdentifiedElement(alias);
-      var marker = new AliasMarker({
-        map: map,
-        element: ie
-      });
       var center = map.getCenter();
       return map.fitBounds([alias]).then(function () {
         var center2 = map.getCenter();
diff --git a/frontend-js/src/test/js/map/CustomMap-test.js b/frontend-js/src/test/js/map/CustomMap-test.js
index 222e6754cc619399166b911a3078a8373ace881d..64e7a66024609508433c94154f04ccd089bac658 100644
--- a/frontend-js/src/test/js/map/CustomMap-test.js
+++ b/frontend-js/src/test/js/map/CustomMap-test.js
@@ -285,44 +285,6 @@ describe('CustomMap', function () {
     });
   });
 
-  describe("openInfoWindowForAlias", function () {
-    it("default", function () {
-      var map = helper.createCustomMap();
-      var layout = helper.createOverlay();
-      var alias = helper.createAlias();
-      alias.setModelId(map.getId());
-      var layoutAlias = helper.createLayoutAlias();
-      layoutAlias.setId(alias.getId());
-
-      layout.addAlias(layoutAlias);
-
-      // create layout
-      map.getProject().addDataOverlay(layout);
-      map.getModel().addAlias(alias);
-
-      return map.openInfoWindowForAlias(alias).then(function () {
-        assert.ok(map.getAliasInfoWindowById(alias.getId()));
-        assert.ok(map.getAliasInfoWindowById(alias.getId()).isOpened());
-      });
-    });
-
-    it("for incomplete alias", function () {
-      var map, alias;
-      return ServerConnector.getProject().then(function (project) {
-        var options = helper.createCustomMapOptions(project);
-        map = new CustomMap(options);
-
-        return map.getModel().getAliasById(329171, false);
-      }).then(function (result) {
-        alias = result;
-        assert.notOk(alias.isComplete());
-        return map.openInfoWindowForAlias(alias);
-      }).then(function () {
-        assert.ok(map.getAliasInfoWindowById(alias.getId()));
-        assert.ok(map.getAliasInfoWindowById(alias.getId()).isOpened());
-      });
-    });
-  });
 
 
   describe("renderOverlayCollection", function () {