diff --git a/resources/static/dialog/resources/tooltip.js b/resources/static/dialog/resources/tooltip.js
index 01a3b34a2b4974f431ce7e14406d2a0d0e47ccbf..602602b4a31a97763bd23e9bf26406cd41a3d9f9 100644
--- a/resources/static/dialog/resources/tooltip.js
+++ b/resources/static/dialog/resources/tooltip.js
@@ -45,7 +45,7 @@ BrowserID.Tooltip = (function() {
   function createTooltip(el) {
       var contents = el.html();
       var template = $("#templateTooltip").html();
-      _.templatesettings = {
+      _.templateSettings = {
           interpolate : /\{\{(.+?)\}\}/g
       };
       var tooltip = $(_.template(template, {
@@ -89,7 +89,6 @@ BrowserID.Tooltip = (function() {
       positionTooltip(tooltip, target);
 
       animateTooltip(tooltip, function() {
-        console.log("close tooltip");
         if (tooltip) {
           tooltip.remove();
           tooltip = null;
diff --git a/resources/static/test/qunit.html b/resources/static/test/qunit.html
index 66a3ce39f6e3dfc823ed0023048c05f5fa7e2c75..3e2ae0292f2d5da9e8b6826bd23d7c8af49032ff 100644
--- a/resources/static/test/qunit.html
+++ b/resources/static/test/qunit.html
@@ -70,7 +70,7 @@
     </script>
 
     <script type="text/html" id="templateTooltip">
-      <div class="tooltip">
+      <div class="tooltip" id="createdTooltip">
         {{ contents }}
       </div>
     </script>
diff --git a/resources/static/test/qunit/resources/tooltip_unit_test.js b/resources/static/test/qunit/resources/tooltip_unit_test.js
index 85dae3a28f8e2ca87b09a4ebe4a1248cf49024ad..ab12693190b8de498bdc9a7f9e3ef2aae0d5c77b 100644
--- a/resources/static/test/qunit/resources/tooltip_unit_test.js
+++ b/resources/static/test/qunit/resources/tooltip_unit_test.js
@@ -52,7 +52,6 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/tooltip", func
     var startTime = new Date().getTime();
 
     tooltip.showTooltip("#shortTooltip", function() {
-      console.log("calling tooltip back");
       var endTime = new Date().getTime();
       var diff = endTime - startTime;
       ok(2000 <= diff && diff <= 3000, diff + " - minimum of 2 seconds, max of 3 seconds");
@@ -60,6 +59,11 @@ steal.plugins("jquery", "funcunit/qunit").then("/dialog/resources/tooltip", func
       start();
     });
 
+    var el = $("#createdTooltip");
+    equal(el.length, 1, "one tooltip created");
+    var contents = el.html() || "";
+    equal(contents.indexOf("contents") === -1, true, "contents have been replaced");
+
     stop();
   });