diff --git a/misc/internal-docs/content-tracking.md b/misc/internal-docs/content-tracking.md
index 9a3d6f8cd8aa63ef795001ea70aa48d5fb15b3b8..154419957bd66149acdeaf64277f81c5a8389768 100644
--- a/misc/internal-docs/content-tracking.md
+++ b/misc/internal-docs/content-tracking.md
@@ -434,12 +434,10 @@ Nothing special here I think. We would probably automatically detect the type of
 * Cache allowed site urls for redirects
 * Test scroll event in ie9, ie10, ie11, opera
 * Run JS tests  in ff3, ie7, ie8, ie9, ie11, android, iphone, ms phone
-* Write UI test
 * Show images on hover in report
 * When a user clicks on an interaction, we should check whether we have already tracked the impression as the content is visible now. If not tracked before, we should track the impression as well
   * There can be a scroll or timer event that detects the same content became visible as well. This would not be a problem since we do not track same content block twice
   * Maybe v2
-* Create issue for not installed core dimensions if they are disabled by default (Action / Contents dependency)
 * Content piece undefined vs Unknown?
 
 ## V2:
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index 1988c352a0bb2fe5f295375e23a42c93fb61beed..a67f40b526bd2c1ddab34c34d901e0c9a4e9bc97 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -443,23 +443,27 @@ function PiwikTest() {
         var query   = tracker.getQuery();
         var actual;
 
-        actual = query.findFirstNodeHavingClass();
-        strictEqual(actual, undefined, "findFirstNodeHavingClass, no node set");
 
-        actual = query.findFirstNodeHavingClass(document.body);
-        strictEqual(actual, undefined, "findFirstNodeHavingClass, no classname set");
+        actual = query.hasNodeCssClass();
+        strictEqual(actual, false, "hasNodeCssClass, no element set");
 
-        actual = query.findFirstNodeHavingClass(document.body, 'notExistingClass');
-        strictEqual(actual, undefined, "findFirstNodeHavingClass, no such classname exists");
+        actual = query.hasNodeCssClass(_e('clickDiv'));
+        strictEqual(actual, false, "hasNodeCssClass, no classname set");
 
-        actual = query.findFirstNodeHavingClass(document.body, 'piwik_ignore');
-        strictEqual(actual, _e('click2'), "findFirstNodeHavingClass, find matching within body");
+        actual = query.hasNodeCssClass(_e('clickDiv'), 'anyClass');
+        strictEqual(actual, false, "hasNodeCssClass, element has no class at all");
 
-        actual = query.findFirstNodeHavingClass(_e('other'), 'clicktest');
-        strictEqual(actual, _e('click1'), "findFirstNodeHavingClass, find matching within node");
+        actual = query.hasNodeCssClass(_e('click3'), 'anyClass');
+        strictEqual(actual, false, "hasNodeCssClass, element has one classes and it does not match");
 
-        actual = query.findFirstNodeHavingClass(_e('click1'), 'clicktest');
-        strictEqual(actual, _e('click1'), "findFirstNodeHavingClass, passed node has class itself");
+        actual = query.hasNodeCssClass(_e('click3'), 'clicktest');
+        strictEqual(actual, true, "hasNodeCssClass, element has one classes and it matches");
+
+        actual = query.hasNodeCssClass(_e('click7'), 'anyClass');
+        strictEqual(actual, false, "hasNodeCssClass, element has many classes but not this one");
+
+        actual = query.hasNodeCssClass(_e('click7'), 'piwik_download');
+        strictEqual(actual, true, "hasNodeCssClass, element has many classes and it matches");
 
 
         actual = query.findNodesHavingCssClass();
@@ -489,26 +493,23 @@ function PiwikTest() {
 
 
 
-        actual = query.hasNodeCssClass();
-        strictEqual(actual, false, "hasNodeCssClass, no element set");
-
-        actual = query.hasNodeCssClass(_e('clickDiv'));
-        strictEqual(actual, false, "hasNodeCssClass, no classname set");
+        actual = query.findFirstNodeHavingClass();
+        strictEqual(actual, undefined, "findFirstNodeHavingClass, no node set");
 
-        actual = query.hasNodeCssClass(_e('clickDiv'), 'anyClass');
-        strictEqual(actual, false, "hasNodeCssClass, element has no class at all");
+        actual = query.findFirstNodeHavingClass(document.body);
+        strictEqual(actual, undefined, "findFirstNodeHavingClass, no classname set");
 
-        actual = query.hasNodeCssClass(_e('click3'), 'anyClass');
-        strictEqual(actual, false, "hasNodeCssClass, element has one classes and it does not match");
+        actual = query.findFirstNodeHavingClass(document.body, 'notExistingClass');
+        strictEqual(actual, undefined, "findFirstNodeHavingClass, no such classname exists");
 
-        actual = query.hasNodeCssClass(_e('click3'), 'clicktest');
-        strictEqual(actual, true, "hasNodeCssClass, element has one classes and it matches");
+        actual = query.findFirstNodeHavingClass(document.body, 'piwik_ignore');
+        strictEqual(actual, _e('click2'), "findFirstNodeHavingClass, find matching within body");
 
-        actual = query.hasNodeCssClass(_e('click7'), 'anyClass');
-        strictEqual(actual, false, "hasNodeCssClass, element has many classes but not this one");
+        actual = query.findFirstNodeHavingClass(_e('other'), 'clicktest');
+        strictEqual(actual, _e('click1'), "findFirstNodeHavingClass, find matching within node");
 
-        actual = query.hasNodeCssClass(_e('click7'), 'piwik_download');
-        strictEqual(actual, true, "hasNodeCssClass, element has many classes and it matches");
+        actual = query.findFirstNodeHavingClass(_e('click1'), 'clicktest');
+        strictEqual(actual, _e('click1'), "findFirstNodeHavingClass, passed node has class itself");