You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2018/06/07 14:44:55 UTC

[myfaces-tobago] branch master updated (0d2b782 -> 2e1fa9f)

This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.


    from 0d2b782  remove deprecated 'selector' method from tobago-suggest.js
     new e2bc3ce  remove unnecessary TTT.waitForResponse();
     new 2e1fa9f  improve tests: replace 'var' with 'let'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/webapp/content/10-intro/intro.test.js |   2 +-
 .../20-component/010-input/10-in/in.test.js        |  16 +-
 .../010-input/20-suggest/suggest.test.js           |  52 ++---
 .../20-component/010-input/40-date/date.test.js    |  54 +++---
 .../selectBooleanCheckbox.test.js                  |  60 +++---
 .../20-selectOneChoice/selectOneChoice.test.js     |  36 ++--
 .../30-selectOneRadio/selectOneRadio.test.js       |  32 ++--
 .../40-selectOneListbox/selectOneListbox.test.js   |  28 +--
 .../selectManyCheckbox.test.js                     |  40 ++--
 .../040-command/20-buttons/buttons.test.js         |   2 +-
 .../20-component/050-container/10-box/box.test.js  |  28 +--
 .../050-container/40-section/section.test.js       |   4 +-
 .../content/20-component/060-popup/popup.test.js   |  90 ++++-----
 .../content/20-component/070-tab/tab.test.js       |  30 +--
 .../080-sheet/10-sort/sheet-sorting.test.js        | 130 ++++++-------
 .../080-sheet/30-event/sheet-event.test.js         |  52 ++---
 .../090-tree/01-select/tree-select.test.js         | 118 ++++++------
 .../06-validation/00/content-validation.test.js    | 106 +++++------
 .../06-validation/01/validation-jsr303.test.js     |  40 ++--
 .../08-form/10-required/form-required.test.js      | 138 +++++++-------
 .../30-concept/08-form/20-ajax/form-ajax.test.js   | 212 ++++++++++-----------
 .../webapp/content/30-concept/08-form/form.test.js |  28 +--
 .../30-concept/51-for-each/for-each.test.js        |  16 +-
 .../00-collapsible-box/collapsible-box.test.js     | 122 ++++++------
 .../10-collapsible-popup/collapsible-popup.test.js |  44 ++---
 .../20-collapsible-panel/collapsible-panel.test.js |  56 +++---
 .../collapsible-section.test.js                    |  56 +++---
 .../15-suggest-method/suggest-method.test.js       |  20 +-
 .../1020-suggest-quotMark/suggest-quotMark.test.js |  22 +--
 .../webapp/content/40-test/1040-date/date.test.js  |   4 +-
 .../40-test/1041-date-pattern/date-pattern.test.js |  28 +--
 .../40-test/2500-tab/tabgroup-style.test.js        |  20 +-
 .../4050-ajax-dropdown/ajax-dropdown.test.js       |  10 +-
 .../40-test/4000-button+link/button+link.test.js   |  38 ++--
 .../40000-style/100-headings/headings.test.js      |  38 ++--
 .../100-id-markup/id-markup.test.js                |  88 ++++-----
 .../4810-labelLayoutTop/labelLayoutTop.test.js     |   4 +-
 .../rendererBase-getCurrentValue.test.js           |   2 +-
 .../20-ajax-execute/ajax-execute.test.js           |  16 +-
 .../ajax-special-character.test.js                 |  16 +-
 .../content/40-test/6000-event/event.test.js       |  68 +++----
 .../content/40-test/6500-behavior/behavior.test.js |  90 ++++-----
 .../9010-mode-valueIfSet/mode-valueIfSet.test.js   |   8 +-
 .../src/main/webapp/error/error.test.js            |   4 +-
 .../src/main/webapp/script/tobago-test.js          |  34 ++--
 45 files changed, 1051 insertions(+), 1051 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.

[myfaces-tobago] 01/02: remove unnecessary TTT.waitForResponse();

Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit e2bc3cebdd745e04f8068a8aecef482a58b2983e
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Jun 7 14:31:48 2018 +0200

    remove unnecessary TTT.waitForResponse();
---
 .../20-component/010-input/10-in/in.test.js        |  4 +-
 .../090-tree/01-select/tree-select.test.js         | 46 +++++++++++-----------
 .../08-form/10-required/form-required.test.js      | 18 ++++-----
 .../content/40-test/6000-event/event.test.js       |  6 +--
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
index d385e71..8bdbee8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
@@ -24,7 +24,7 @@ QUnit.test("inputfield with label", function (assert) {
     assert.equal($label().text(), "Input");
     assert.equal($inputField().val(), "Some Text");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $inputField().val("abc");
   });
   TTT.asserts(1, function () {
@@ -42,7 +42,7 @@ QUnit.test("ajax change event", function (assert) {
     assert.equal($inputField().val(), "");
     assert.equal($outputField().text(), "");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $inputField().val("qwe").trigger("change");
   });
   TTT.waitForResponse();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js
index ae5027a..259aa3a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js
@@ -24,28 +24,28 @@ QUnit.test("single: select Music, select Mathematics", function (assert) {
   var $input = jQueryFrameFn(".tobago-treeSelect input");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableSingle().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.notEqual($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $music().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Music");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $mathematics().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
@@ -64,28 +64,28 @@ QUnit.test("singleLeafOnly: select Classic, select Mathematics", function (asser
   var $input = jQueryFrameFn(".tobago-treeSelect input");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableSingleLeafOnly().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.notEqual($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $classic().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Classic");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $mathematics().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
@@ -104,35 +104,35 @@ QUnit.test("multi: select Music, select Mathematics, deselect Music", function (
   var $input = jQueryFrameFn(".tobago-treeSelect input");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableMulti().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.notEqual($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $music().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Music");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $mathematics().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Music, Mathematics");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $music().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
@@ -151,35 +151,35 @@ QUnit.test("multiLeafOnly: select Classic, select Mathematics, deselect Classic"
   var $input = jQueryFrameFn(".tobago-treeSelect input");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableMultiLeafOnly().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.notEqual($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $classic().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Classic");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $mathematics().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Classic, Mathematics");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $classic().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
@@ -199,21 +199,21 @@ QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", f
   var $input = jQueryFrameFn(".tobago-treeSelect input");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $selectableMultiCascade().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.notEqual($input().length, 0);
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $music().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse(); // an ajax request is send for every leaf (Music, Classic, Pop, World)
@@ -221,14 +221,14 @@ QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", f
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Music, Classic, Pop, World");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $mathematics().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.equal($output().text(), "Music, Classic, Pop, World, Mathematics");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $classic().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js
index dd9007c..f074810 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js
@@ -22,7 +22,7 @@ QUnit.test("submit inner form 1 without violations", function (assert) {
   var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form1InputField().val("Alice");
     $form1SubmitButton().click();
   });
@@ -43,13 +43,13 @@ QUnit.test("submit inner form 2, violate required field", function (assert) {
   var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2InputField().val("");
   });
   TTT.asserts(1, function () {
     assert.equal($form2InputField().val(), "");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2SubmitButton().click();
   });
   TTT.waitForResponse();
@@ -68,13 +68,13 @@ QUnit.test("submit inner form 2 without violations", function (assert) {
   var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2InputField().val("Bob");
   });
   TTT.asserts(1, function () {
     assert.equal($form2InputField().val(), "Bob");
   });
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2SubmitButton().click();
   });
   TTT.waitForResponse();
@@ -98,7 +98,7 @@ QUnit.test("submit outer form, violate both required fields", function (assert)
   var outerFormOutputFieldValue = $outerFormOutputField().text();
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2InputField().val("");
     $outerFormInputField().val("");
     $outerFormSubmitButton().click();
@@ -126,7 +126,7 @@ QUnit.test("submit outer form, violate required field in form 2", function (asse
   var outerFormOutputFieldValue = $outerFormOutputField().text();
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2InputField().val("");
     $outerFormInputField().val("Charlie");
     $outerFormSubmitButton().click();
@@ -154,7 +154,7 @@ QUnit.test("submit outer form, violate required field in outer form", function (
   var outerFormOutputFieldValue = $outerFormOutputField().text();
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form2InputField().val("Dave");
     $outerFormInputField().val("");
     $outerFormSubmitButton().click();
@@ -181,7 +181,7 @@ QUnit.test("submit outer form without violations", function (assert) {
   var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
   var TTT = new TobagoTestTools(assert);
-  TTT.action(function () {TTT.waitForResponse();
+  TTT.action(function () {
     $form1InputField().val("Eve");
     $form2InputField().val("Frank");
     $outerFormInputField().val("Grace");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
index e495d0b..dab79b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
@@ -83,11 +83,11 @@ function testEvent(assert, componentName, eventNames, $eventComponent, $ajaxComp
   for (i = 0; i < eventNames.length; i++) {
     var eventName = eventNames[i];
 
-    TTT.action(function () {TTT.waitForResponse();
+    TTT.action(function () {
       activateComponent(componentName, eventName);
     });
     TTT.waitForResponse();
-    TTT.action(function () {TTT.waitForResponse();
+    TTT.action(function () {
       oldActionCount = getActionCount();
       oldActionListenerCount = getActionListenerCount();
       oldAjaxListenerCount = getAjaxListenerCount();
@@ -113,7 +113,7 @@ function testEvent(assert, componentName, eventNames, $eventComponent, $ajaxComp
       }
       assert.ok(getTimestamp() > oldTimestamp, eventName + " - tc:event - timestamp");
     });
-    TTT.action(function () {TTT.waitForResponse();
+    TTT.action(function () {
       oldActionCount = getActionCount();
       oldActionListenerCount = getActionListenerCount();
       oldAjaxListenerCount = getAjaxListenerCount();

-- 
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.

[myfaces-tobago] 02/02: improve tests: replace 'var' with 'let'

Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 2e1fa9fba080697ad9b461d6c716f2d5fe67723a
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Jun 7 15:25:04 2018 +0200

    improve tests: replace 'var' with 'let'
---
 .../src/main/webapp/content/10-intro/intro.test.js |   2 +-
 .../20-component/010-input/10-in/in.test.js        |  12 +-
 .../010-input/20-suggest/suggest.test.js           |  52 ++---
 .../20-component/010-input/40-date/date.test.js    |  54 +++---
 .../selectBooleanCheckbox.test.js                  |  60 +++---
 .../20-selectOneChoice/selectOneChoice.test.js     |  36 ++--
 .../30-selectOneRadio/selectOneRadio.test.js       |  32 ++--
 .../40-selectOneListbox/selectOneListbox.test.js   |  28 +--
 .../selectManyCheckbox.test.js                     |  40 ++--
 .../040-command/20-buttons/buttons.test.js         |   2 +-
 .../20-component/050-container/10-box/box.test.js  |  28 +--
 .../050-container/40-section/section.test.js       |   4 +-
 .../content/20-component/060-popup/popup.test.js   |  90 ++++-----
 .../content/20-component/070-tab/tab.test.js       |  30 +--
 .../080-sheet/10-sort/sheet-sorting.test.js        | 130 ++++++-------
 .../080-sheet/30-event/sheet-event.test.js         |  52 ++---
 .../090-tree/01-select/tree-select.test.js         |  72 +++----
 .../06-validation/00/content-validation.test.js    | 106 +++++------
 .../06-validation/01/validation-jsr303.test.js     |  40 ++--
 .../08-form/10-required/form-required.test.js      | 106 +++++------
 .../30-concept/08-form/20-ajax/form-ajax.test.js   | 212 ++++++++++-----------
 .../webapp/content/30-concept/08-form/form.test.js |  28 +--
 .../30-concept/51-for-each/for-each.test.js        |  16 +-
 .../00-collapsible-box/collapsible-box.test.js     | 122 ++++++------
 .../10-collapsible-popup/collapsible-popup.test.js |  44 ++---
 .../20-collapsible-panel/collapsible-panel.test.js |  56 +++---
 .../collapsible-section.test.js                    |  56 +++---
 .../15-suggest-method/suggest-method.test.js       |  20 +-
 .../1020-suggest-quotMark/suggest-quotMark.test.js |  22 +--
 .../webapp/content/40-test/1040-date/date.test.js  |   4 +-
 .../40-test/1041-date-pattern/date-pattern.test.js |  28 +--
 .../40-test/2500-tab/tabgroup-style.test.js        |  20 +-
 .../4050-ajax-dropdown/ajax-dropdown.test.js       |  10 +-
 .../40-test/4000-button+link/button+link.test.js   |  38 ++--
 .../40000-style/100-headings/headings.test.js      |  38 ++--
 .../100-id-markup/id-markup.test.js                |  88 ++++-----
 .../4810-labelLayoutTop/labelLayoutTop.test.js     |   4 +-
 .../rendererBase-getCurrentValue.test.js           |   2 +-
 .../20-ajax-execute/ajax-execute.test.js           |  16 +-
 .../ajax-special-character.test.js                 |  16 +-
 .../content/40-test/6000-event/event.test.js       |  62 +++---
 .../content/40-test/6500-behavior/behavior.test.js |  90 ++++-----
 .../9010-mode-valueIfSet/mode-valueIfSet.test.js   |   8 +-
 .../src/main/webapp/error/error.test.js            |   4 +-
 .../src/main/webapp/script/tobago-test.js          |  34 ++--
 45 files changed, 1007 insertions(+), 1007 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.test.js
index d2e6110..c2bf26d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.test.js
@@ -18,7 +18,7 @@
 QUnit.test("First section title is 'Intro'", function (assert) {
   assert.expect(1);
 
-  var titleOfFirstSectionHeader = jQueryFrame(".tobago-section-header:first span").text();
+  let titleOfFirstSectionHeader = jQueryFrame(".tobago-section-header:first span").text();
 
   assert.equal(titleOfFirstSectionHeader, "Intro");
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
index 8bdbee8..56258a3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
@@ -16,10 +16,10 @@
  */
 
 QUnit.test("inputfield with label", function (assert) {
-  var $label = jQueryFrameFn("#page\\:mainForm\\:iNormal > label");
-  var $inputField = jQueryFrameFn("#page\\:mainForm\\:iNormal\\:\\:field");
+  let $label = jQueryFrameFn("#page\\:mainForm\\:iNormal > label");
+  let $inputField = jQueryFrameFn("#page\\:mainForm\\:iNormal\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
     assert.equal($label().text(), "Input");
     assert.equal($inputField().val(), "Some Text");
@@ -34,10 +34,10 @@ QUnit.test("inputfield with label", function (assert) {
 });
 
 QUnit.test("ajax change event", function (assert) {
-  var $inputField = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
-  var $outputField = jQueryFrameFn("#page\\:mainForm\\:outputAjax span:first");
+  let $inputField = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+  let $outputField = jQueryFrameFn("#page\\:mainForm\\:outputAjax span:first");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
     assert.equal($inputField().val(), "");
     assert.equal($outputField().text(), "");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.test.js
index 54961fa..63afe1b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/suggest.test.js
@@ -16,38 +16,38 @@
  */
 
 QUnit.test("Basics: 'M'", function (assert) {
-  var inputString = "M";
-  var expectedLength = 10;
+  let inputString = "M";
+  let expectedLength = 10;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Ma'", function (assert) {
-  var inputString = "Ma";
-  var expectedLength = 4;
+  let inputString = "Ma";
+  let expectedLength = 4;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mar'", function (assert) {
-  var inputString = "Mar";
-  var expectedLength = 1;
+  let inputString = "Mar";
+  let expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mars'", function (assert) {
-  var inputString = "Mars";
-  var expectedLength = 1;
+  let inputString = "Mars";
+  let expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  var $in = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:inBasic");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:inBasic");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val(inputString).trigger('input');
   });
@@ -62,10 +62,10 @@ function testMarsBasics(assert, inputString, expectedLength) {
 }
 
 QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
-  var $in = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:inBasic");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:inBasic");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("eus").trigger('input');
   });
@@ -88,11 +88,11 @@ QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
 });
 
 QUnit.test("Advanced: 'C'", function (assert) {
-  var $in = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:inAdvanced");
-  var suggestionDelay = 2000;
+  let $in = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  let suggestionDelay = 2000;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("C").trigger('input');
   });
@@ -104,12 +104,12 @@ QUnit.test("Advanced: 'C'", function (assert) {
 });
 
 QUnit.test("Advanced: 'Ca'", function (assert) {
-  var $in = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:inAdvanced");
-  var suggestionDelay = 2000;
-  var startTime = Date.now();
+  let $in = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  let suggestionDelay = 2000;
+  let startTime = Date.now();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("Ca").trigger('input');
   });
@@ -130,10 +130,10 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
 });
 
 QUnit.test("Client side: 'Ju'", function (assert) {
-  var $in = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:inClient");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:inClient");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("Ju").trigger('input');
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.test.js
index 75c9641..04638c0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/date.test.js
@@ -16,19 +16,19 @@
  */
 
 function getToday($dateField) {
-  var tobagoToday = $dateField().data("tobago-today");
-  var todayArray = tobagoToday.split("-");
+  let tobagoToday = $dateField().data("tobago-today");
+  let todayArray = tobagoToday.split("-");
   return todayArray[2] + "." + todayArray[1] + "." + todayArray[0];
 }
 
 QUnit.test("date with label", function (assert) {
   assert.expect(5);
 
-  var $label = jQueryFrameFn("#page\\:mainForm\\:dNormal > label");
-  var $dateField = jQueryFrameFn("#page\\:mainForm\\:dNormal\\:\\:field");
-  var $dateButton = jQueryFrameFn("#page\\:mainForm\\:dNormal button");
-  var $dayToday = jQueryFrameFn(".day.today");
-  var today = getToday($dateField);
+  let $label = jQueryFrameFn("#page\\:mainForm\\:dNormal > label");
+  let $dateField = jQueryFrameFn("#page\\:mainForm\\:dNormal\\:\\:field");
+  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:dNormal button");
+  let $dayToday = jQueryFrameFn(".day.today");
+  let today = getToday($dateField);
 
   assert.equal($label().text(), "Date");
   assert.equal($dateField().val(), today);
@@ -44,13 +44,13 @@ QUnit.test("date with label", function (assert) {
 });
 
 QUnit.test("date+time pattern", function (assert) {
-  var $dateButton = jQueryFrameFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
-  var $datepicker = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  var $firstLi = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
-  var $lastLi = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
-  var $togglePickerButton = jQueryFrameFn(".bootstrap-datetimepicker-widget .picker-switch a");
+  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
+  let $datepicker = jQueryFrameFn(".bootstrap-datetimepicker-widget");
+  let $firstLi = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
+  let $lastLi = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
+  let $togglePickerButton = jQueryFrameFn(".bootstrap-datetimepicker-widget .picker-switch a");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $dateButton().click();
   });
@@ -74,15 +74,15 @@ QUnit.test("date+time pattern", function (assert) {
 });
 
 QUnit.test("submit", function (assert) {
-  var $dateField = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
-  var $dateButton = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input button");
-  var $outField = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:output span");
-  var $submitButton = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:button");
-  var $widget = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  var $days = jQueryFrameFn(".bootstrap-datetimepicker-widget .day");
-  var day22 = 0;
+  let $dateField = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
+  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input button");
+  let $outField = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:output span");
+  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:button");
+  let $widget = jQueryFrameFn(".bootstrap-datetimepicker-widget");
+  let $days = jQueryFrameFn(".bootstrap-datetimepicker-widget .day");
+  let day22 = 0;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
     assert.equal($dateField().val(), "22.05.2016");
     assert.equal($outField().text(), "22.05.2016");
@@ -118,13 +118,13 @@ QUnit.test("submit", function (assert) {
 });
 
 QUnit.test("ajax", function (assert) {
-  var $dateField = jQueryFrameFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
-  var $dateButton = jQueryFrameFn("#page\\:mainForm\\:ajaxinput button");
-  var $outField = jQueryFrameFn("#page\\:mainForm\\:outputfield span");
-  var $widget = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  var today = getToday($dateField);
+  let $dateField = jQueryFrameFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
+  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:ajaxinput button");
+  let $outField = jQueryFrameFn("#page\\:mainForm\\:outputfield span");
+  let $widget = jQueryFrameFn(".bootstrap-datetimepicker-widget");
+  let today = getToday($dateField);
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
     assert.equal($dateField().val(), "");
     assert.equal($outField().text(), "");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.test.js
index 5d8a8b4..f2a801e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/selectBooleanCheckbox.test.js
@@ -16,13 +16,13 @@
  */
 
 QUnit.test("submit: select A", function (assert) {
-  var $selectA = jQueryFrameFn("#page\\:mainForm\\:selectA input");
-  var $selectB = jQueryFrameFn("#page\\:mainForm\\:selectB input");
-  var $selectC = jQueryFrameFn("#page\\:mainForm\\:selectC input");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
+  let $selectA = jQueryFrameFn("#page\\:mainForm\\:selectA input");
+  let $selectB = jQueryFrameFn("#page\\:mainForm\\:selectB input");
+  let $selectC = jQueryFrameFn("#page\\:mainForm\\:selectC input");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectA().prop("checked", true);
     $selectB().prop("checked", false);
@@ -37,13 +37,13 @@ QUnit.test("submit: select A", function (assert) {
 });
 
 QUnit.test("submit: select B and C", function (assert) {
-  var $selectA = jQueryFrameFn("#page\\:mainForm\\:selectA input");
-  var $selectB = jQueryFrameFn("#page\\:mainForm\\:selectB input");
-  var $selectC = jQueryFrameFn("#page\\:mainForm\\:selectC input");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
+  let $selectA = jQueryFrameFn("#page\\:mainForm\\:selectA input");
+  let $selectB = jQueryFrameFn("#page\\:mainForm\\:selectB input");
+  let $selectC = jQueryFrameFn("#page\\:mainForm\\:selectC input");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectA().prop("checked", false);
     $selectB().prop("checked", true);
@@ -58,10 +58,10 @@ QUnit.test("submit: select B and C", function (assert) {
 });
 
 QUnit.test("ajax: select D", function (assert) {
-  var $selectD = jQueryFrameFn("#page\\:mainForm\\:selectD input");
-  var $outputD = jQueryFrameFn("#page\\:mainForm\\:outputD span");
+  let $selectD = jQueryFrameFn("#page\\:mainForm\\:selectD input");
+  let $outputD = jQueryFrameFn("#page\\:mainForm\\:outputD span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectD().prop("checked", true).trigger("change");
   });
@@ -73,10 +73,10 @@ QUnit.test("ajax: select D", function (assert) {
 });
 
 QUnit.test("ajax: deselect D", function (assert) {
-  var $selectD = jQueryFrameFn("#page\\:mainForm\\:selectD input");
-  var $outputD = jQueryFrameFn("#page\\:mainForm\\:outputD span");
+  let $selectD = jQueryFrameFn("#page\\:mainForm\\:selectD input");
+  let $outputD = jQueryFrameFn("#page\\:mainForm\\:outputD span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectD().prop("checked", false).trigger("change");
   });
@@ -88,10 +88,10 @@ QUnit.test("ajax: deselect D", function (assert) {
 });
 
 QUnit.test("ajax: select E", function (assert) {
-  var $selectE = jQueryFrameFn("#page\\:mainForm\\:selectE input");
-  var $outputE = jQueryFrameFn("#page\\:mainForm\\:outputE span");
+  let $selectE = jQueryFrameFn("#page\\:mainForm\\:selectE input");
+  let $outputE = jQueryFrameFn("#page\\:mainForm\\:outputE span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectE().prop("checked", true).trigger("change");
   });
@@ -103,10 +103,10 @@ QUnit.test("ajax: select E", function (assert) {
 });
 
 QUnit.test("ajax: deselect E", function (assert) {
-  var $selectE = jQueryFrameFn("#page\\:mainForm\\:selectE input");
-  var $outputE = jQueryFrameFn("#page\\:mainForm\\:outputE span");
+  let $selectE = jQueryFrameFn("#page\\:mainForm\\:selectE input");
+  let $outputE = jQueryFrameFn("#page\\:mainForm\\:outputE span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectE().prop("checked", false).trigger("change");
   });
@@ -118,10 +118,10 @@ QUnit.test("ajax: deselect E", function (assert) {
 });
 
 QUnit.test("ajax: select F", function (assert) {
-  var $selectF = jQueryFrameFn("#page\\:mainForm\\:selectF input");
-  var $outputF = jQueryFrameFn("#page\\:mainForm\\:outputF span");
+  let $selectF = jQueryFrameFn("#page\\:mainForm\\:selectF input");
+  let $outputF = jQueryFrameFn("#page\\:mainForm\\:outputF span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectF().prop("checked", true).trigger("change");
   });
@@ -133,10 +133,10 @@ QUnit.test("ajax: select F", function (assert) {
 });
 
 QUnit.test("ajax: deselect F", function (assert) {
-  var $selectF = jQueryFrameFn("#page\\:mainForm\\:selectF input");
-  var $outputF = jQueryFrameFn("#page\\:mainForm\\:outputF span");
+  let $selectF = jQueryFrameFn("#page\\:mainForm\\:selectF input");
+  let $outputF = jQueryFrameFn("#page\\:mainForm\\:outputF span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectF().prop("checked", false).trigger("change");
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js
index 6342c92..2788c41 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/selectOneChoice.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("submit: Alice", function (assert) {
-  var $alice = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
-  var $bob = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
+  let $alice = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
+  let $bob = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $alice().prop("selected", true);
     $bob().prop("selected", false);
@@ -36,12 +36,12 @@ QUnit.test("submit: Alice", function (assert) {
 });
 
 QUnit.test("submit: Bob", function (assert) {
-  var $alice = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
-  var $bob = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
+  let $alice = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
+  let $bob = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $alice().prop("selected", false);
     $bob().prop("selected", true);
@@ -55,11 +55,11 @@ QUnit.test("submit: Bob", function (assert) {
 });
 
 QUnit.test("ajax: select Mars", function (assert) {
-  var $mars = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
-  var $jupiter = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
-  var $moons = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+  let $mars = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
+  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
+  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $jupiter().prop("selected", false);
     $mars().prop("selected", true).trigger("change");
@@ -73,11 +73,11 @@ QUnit.test("ajax: select Mars", function (assert) {
 });
 
 QUnit.test("ajax: select Jupiter", function (assert) {
-  var $mars = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
-  var $jupiter = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
-  var $moons = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+  let $mars = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
+  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
+  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $mars().prop("selected", false);
     $jupiter().prop("selected", true).trigger("change");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js
index c48c2bd..05dcc3c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/selectOneRadio.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("submit: Addition (2 + 4)", function (assert) {
-  var $number1 = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
-  var $number2 = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
-  var $submitAdd = jQueryFrameFn("#page\\:mainForm\\:submitAdd");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let $number1 = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
+  let $number2 = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
+  let $submitAdd = jQueryFrameFn("#page\\:mainForm\\:submitAdd");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $number1().eq(0).prop("checked", false);
     $number1().eq(1).prop("checked", true); // Select 2
@@ -39,12 +39,12 @@ QUnit.test("submit: Addition (2 + 4)", function (assert) {
 });
 
 QUnit.test("submit: Subtraction (4 - 1)", function (assert) {
-  var $number1 = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
-  var $number2 = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
-  var $submitSub = jQueryFrameFn("#page\\:mainForm\\:submitSub");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let $number1 = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
+  let $number2 = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
+  let $submitSub = jQueryFrameFn("#page\\:mainForm\\:submitSub");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $number1().eq(0).prop("checked", false);
     $number1().eq(1).prop("checked", false);
@@ -62,10 +62,10 @@ QUnit.test("submit: Subtraction (4 - 1)", function (assert) {
 });
 
 QUnit.test("ajax: select Mars", function (assert) {
-  var $planet = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
-  var $moons = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
+  let $planet = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
+  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $planet().eq(0).prop("checked", false);
     $planet().eq(2).prop("checked", false);
@@ -80,10 +80,10 @@ QUnit.test("ajax: select Mars", function (assert) {
 });
 
 QUnit.test("ajax: select Jupiter", function (assert) {
-  var $planet = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
-  var $moons = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
+  let $planet = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
+  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $planet().eq(0).prop("checked", false);
     $planet().eq(1).prop("checked", false);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.test.js
index 34c57b5..2e28732 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/selectOneListbox.test.js
@@ -16,11 +16,11 @@
  */
 
 QUnit.test("submit: select 'Nile'", function (assert) {
-  var $rivers = jQueryFrameFn("#page\\:mainForm\\:riverList option");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
+  let $rivers = jQueryFrameFn("#page\\:mainForm\\:riverList option");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $rivers().eq(0).prop("selected", true); // Nile
     $rivers().eq(1).prop("selected", false); // Amazon
@@ -37,11 +37,11 @@ QUnit.test("submit: select 'Nile'", function (assert) {
 });
 
 QUnit.test("submit: select 'Yangtze'", function (assert) {
-  var $rivers = jQueryFrameFn("#page\\:mainForm\\:riverList option");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
+  let $rivers = jQueryFrameFn("#page\\:mainForm\\:riverList option");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $rivers().eq(0).prop("selected", false); // Nile
     $rivers().eq(1).prop("selected", false); // Amazon
@@ -59,10 +59,10 @@ QUnit.test("submit: select 'Yangtze'", function (assert) {
 });
 
 QUnit.test("ajax: select Everest", function (assert) {
-  var $mountains = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
+  let $mountains = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $mountains().eq(1).prop("selected", false);
     $mountains().eq(2).prop("selected", false);
@@ -78,10 +78,10 @@ QUnit.test("ajax: select Everest", function (assert) {
 });
 
 QUnit.test("ajax: select Makalu", function (assert) {
-  var $mountains = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
+  let $mountains = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $mountains().eq(0).prop("selected", false);
     $mountains().eq(1).prop("selected", false);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.test.js
index 1d63df4..386fa47 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/selectManyCheckbox.test.js
@@ -16,11 +16,11 @@
  */
 
 QUnit.test("submit: select cat", function (assert) {
-  var $animals = jQueryFrameFn("#page\\:mainForm\\:animals input");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
+  let $animals = jQueryFrameFn("#page\\:mainForm\\:animals input");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $animals().eq(0).prop("checked", true);
     $animals().eq(1).prop("checked", false);
@@ -36,11 +36,11 @@ QUnit.test("submit: select cat", function (assert) {
 });
 
 QUnit.test("submit: select fox and rabbit", function (assert) {
-  var $animals = jQueryFrameFn("#page\\:mainForm\\:animals input");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
+  let $animals = jQueryFrameFn("#page\\:mainForm\\:animals input");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $animals().eq(0).prop("checked", false);
     $animals().eq(1).prop("checked", false);
@@ -56,11 +56,11 @@ QUnit.test("submit: select fox and rabbit", function (assert) {
 });
 
 QUnit.test("ajax: click 'Two'", function (assert) {
-  var $number2 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
-  var newOutputValue;
+  let $number2 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let newOutputValue;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     if ($number2().prop("checked")) {
       newOutputValue = parseInt($output().text()) - 2;
@@ -78,11 +78,11 @@ QUnit.test("ajax: click 'Two'", function (assert) {
 });
 
 QUnit.test("ajax: click 'Three'", function (assert) {
-  var $number3 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:2");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
-  var newOutputValue;
+  let $number3 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:2");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let newOutputValue;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     if ($number3().prop("checked")) {
       newOutputValue = parseInt($output().text()) - 3;
@@ -100,11 +100,11 @@ QUnit.test("ajax: click 'Three'", function (assert) {
 });
 
 QUnit.test("ajax: click 'Two'", function (assert) {
-  var $number2 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
-  var newOutputValue;
+  let $number2 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let newOutputValue;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     if ($number2().prop("checked")) {
       newOutputValue = parseInt($output().text()) - 2;
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.test.js
index ade2d9b..bc39311 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/buttons.test.js
@@ -16,6 +16,6 @@
  */
 
 QUnit.test("Dropdown button has 'btn-group'", function (assert) {
-  var $button = jQueryFrame("#page\\:mainForm\\:buttonWithLinks");
+  let $button = jQueryFrame("#page\\:mainForm\\:buttonWithLinks");
   assert.ok($button.hasClass("btn-group"), "id=buttonWithLinks must have 'btn-group'");
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.test.js
index bc0fdd1..e81f297 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("Accordion: Box 1: 'hide' to 'show' to 'hide'", function (assert) {
-  var $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox1");
-  var $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox1");
-  var $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox1");
-  var $boxBody = jQueryFrameFn("#page\\:mainForm\\:accordionBox1 .card-body");
+  let $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox1");
+  let $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox1");
+  let $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox1");
+  let $boxBody = jQueryFrameFn("#page\\:mainForm\\:accordionBox1 .card-body");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(3, function () {
     assert.equal($showBox().length, 1);
     assert.equal($hideBox().length, 0);
@@ -49,12 +49,12 @@ QUnit.test("Accordion: Box 1: 'hide' to 'show' to 'hide'", function (assert) {
 });
 
 QUnit.test("Accordion: Box 2: 'hide' to 'show' to 'hide'", function (assert) {
-  var $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox2");
-  var $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox2");
-  var $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox2");
-  var $boxBody = jQueryFrameFn("#page\\:mainForm\\:accordionBox2 .card-body");
+  let $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox2");
+  let $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox2");
+  let $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox2");
+  let $boxBody = jQueryFrameFn("#page\\:mainForm\\:accordionBox2 .card-body");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(3, function () {
     assert.equal($showBox().length, 1);
     assert.equal($hideBox().length, 0);
@@ -82,11 +82,11 @@ QUnit.test("Accordion: Box 2: 'hide' to 'show' to 'hide'", function (assert) {
 });
 
 QUnit.test("Accordion: Box 3: 'hide' to 'show' to 'hide'", function (assert) {
-  var $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox3");
-  var $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox3");
-  var $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox3");
+  let $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox3");
+  let $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox3");
+  let $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox3");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(3, function () {
     assert.ok($box().hasClass("tobago-collapsed"));
     assert.equal($showBox().length, 1);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.test.js
index 48268ed..61df3ad 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.test.js
@@ -18,8 +18,8 @@
 QUnit.test("Attribute 'level'", function (assert) {
   assert.expect(1);
 
-  var $sectionLevel5 = jQueryFrame("#page\\:mainForm\\:sectionLevel5");
-  var $header5 = $sectionLevel5.find("h5");
+  let $sectionLevel5 = jQueryFrame("#page\\:mainForm\\:sectionLevel5");
+  let $header5 = $sectionLevel5.find("h5");
 
   assert.equal($header5.length, 1);
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js
index 485f4a0..c576e90 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js
@@ -18,9 +18,9 @@
 QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
   assert.expect(3);
 
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  var $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  let $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
 
   assert.equal($popup().attr("value"), "true");
   $openButton().click();
@@ -30,16 +30,16 @@ QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Cancel'.", function (assert) {
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
-  var $messages = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
-  var $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  var $submitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
-  var $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
-  var outputValue = $output().text();
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
+  let $messages = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+  let $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  let outputValue = $output().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
     assert.equal($popup().attr("value"), "true");
   });
@@ -68,15 +68,15 @@ QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Can
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press 'Cancel'.", function (assert) {
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
-  var $messages = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
-  var $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  var $submitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
-  var $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
+  let $messages = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+  let $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
     assert.equal($popup().attr("value"), "true");
   });
@@ -105,14 +105,14 @@ QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press '
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.", function (assert) {
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
-  var $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  var $submitCloseButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
-  var outputValue = $output().text();
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
+  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  let $submitCloseButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+  let outputValue = $output().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
     assert.equal($popup().attr("value"), "true");
   });
@@ -135,13 +135,13 @@ QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.",
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.", function (assert) {
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
-  var $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  var $submitCloseButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
+  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  let $submitCloseButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
     assert.equal($popup().attr("value"), "true");
   });
@@ -164,13 +164,13 @@ QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.
 });
 
 QUnit.test("Open 'Large Popup'.", function (assert) {
-  var $dropdownContainer = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
-  var $dropdownButton = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:largePopupLink");
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:largePopup");
-  var $closeButton = jQueryFrameFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
+  let $dropdownContainer = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
+  let $dropdownButton = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:largePopupLink");
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:largePopup");
+  let $closeButton = jQueryFrameFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     if ($popup().hasClass("show")) {
       $closeButton().click();
@@ -210,13 +210,13 @@ QUnit.test("Open 'Large Popup'.", function (assert) {
 });
 
 QUnit.test("Open 'Small Popup'.", function (assert) {
-  var $dropdownContainer = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
-  var $dropdownButton = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
-  var $openButton = jQueryFrameFn("#page\\:mainForm\\:smallPopupLink");
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:smallPopup");
-  var $closeButton = jQueryFrameFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
+  let $dropdownContainer = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
+  let $dropdownButton = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+  let $openButton = jQueryFrameFn("#page\\:mainForm\\:smallPopupLink");
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:smallPopup");
+  let $closeButton = jQueryFrameFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     if ($popup().hasClass("show")) {
       $closeButton().click();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.test.js
index 84453be..ba9d264 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/tab.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("Client: Select Tab 3", function (assert) {
-  var $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupClient\\:\\:activeIndex");
-  var $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1Client");
-  var $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3Client");
-  var $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3Client .nav-link");
+  let $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupClient\\:\\:activeIndex");
+  let $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1Client");
+  let $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3Client");
+  let $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3Client .nav-link");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(5, function () {
     assert.equal($hiddenInput().val(), 0);
     assert.ok($tab1().hasClass("tobago-tab-markup-selected"));
@@ -43,12 +43,12 @@ QUnit.test("Client: Select Tab 3", function (assert) {
 });
 
 QUnit.test("Ajax: Select Tab 3", function (assert) {
-  var $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupAjax\\:\\:activeIndex");
-  var $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1Ajax");
-  var $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax");
-  var $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax .nav-link");
+  let $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupAjax\\:\\:activeIndex");
+  let $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1Ajax");
+  let $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax");
+  let $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax .nav-link");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(5, function () {
     assert.equal($hiddenInput().val(), 0);
     assert.ok($tab1().hasClass("tobago-tab-markup-selected"));
@@ -71,12 +71,12 @@ QUnit.test("Ajax: Select Tab 3", function (assert) {
 });
 
 QUnit.test("FullReload: Select Tab 3", function (assert) {
-  var $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupFullReload\\:\\:activeIndex");
-  var $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1FullReload");
-  var $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload");
-  var $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload .nav-link");
+  let $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupFullReload\\:\\:activeIndex");
+  let $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1FullReload");
+  let $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload");
+  let $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload .nav-link");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(5, function () {
     assert.equal($hiddenInput().val(), 0);
     assert.ok($tab1().hasClass("tobago-tab-markup-selected"));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
index 373c403..c0da5d8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
@@ -16,11 +16,11 @@
  */
 
 QUnit.test("Basics: Name", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -69,11 +69,11 @@ QUnit.test("Basics: Name", function (assert) {
 });
 
 QUnit.test("Basics: Period", function (assert) {
-  var $colPeriod = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let $colPeriod = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colPeriod().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colPeriod().click();
@@ -122,11 +122,11 @@ QUnit.test("Basics: Period", function (assert) {
 });
 
 QUnit.test("Basics: Year", function (assert) {
-  var $colYear = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let $colYear = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colYear().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colYear().click();
@@ -176,11 +176,11 @@ QUnit.test("Basics: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Basics: left paging", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -223,12 +223,12 @@ QUnit.test("Basics: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Basics: center paging", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  var $centerPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let $centerPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -295,13 +295,13 @@ QUnit.test("Basics: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Basics: right paging", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  var $rightPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
-  var $jumpToPage = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let $rightPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
+  let $jumpToPage = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -383,11 +383,11 @@ QUnit.test("Basics: right paging", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Name", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -436,11 +436,11 @@ QUnit.test("Custom Sorting: Name", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Period", function (assert) {
-  var $colPeriod = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let $colPeriod = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colPeriod().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colPeriod().click();
@@ -489,11 +489,11 @@ QUnit.test("Custom Sorting: Period", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Year", function (assert) {
-  var $colYear = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let $colYear = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colYear().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colYear().click();
@@ -543,11 +543,11 @@ QUnit.test("Custom Sorting: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Custom Sorting: left paging", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -590,12 +590,12 @@ QUnit.test("Custom Sorting: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Custom Sorting: center paging", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  var $centerPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let $centerPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -662,12 +662,12 @@ QUnit.test("Custom Sorting: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Custom Sorting: right paging", function (assert) {
-  var $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  var $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  var $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  var $rightPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
+  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let $rightPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       $colName().click();
@@ -750,18 +750,18 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
 
 function ajaxExecuteBodyTableCheck(assert, $rows, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
                                    row2col0, row2col1, row2col2, row3col0, row3col1, row3col2) {
-  var $row0Col0 = $rows().eq(0).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row0Col1 = $rows().eq(0).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row0Col2 = $rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim();
-  var $row1Col0 = $rows().eq(1).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row1Col1 = $rows().eq(1).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row1Col2 = $rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim();
-  var $row2Col0 = $rows().eq(2).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row2Col1 = $rows().eq(2).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row2Col2 = $rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim();
-  var $row3Col0 = $rows().eq(3).find(".tobago-sheet-cell").eq(0).text().trim();
-  var $row3Col1 = $rows().eq(3).find(".tobago-sheet-cell").eq(1).text().trim();
-  var $row3Col2 = $rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim();
+  let $row0Col0 = $rows().eq(0).find(".tobago-sheet-cell").eq(0).text().trim();
+  let $row0Col1 = $rows().eq(0).find(".tobago-sheet-cell").eq(1).text().trim();
+  let $row0Col2 = $rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim();
+  let $row1Col0 = $rows().eq(1).find(".tobago-sheet-cell").eq(0).text().trim();
+  let $row1Col1 = $rows().eq(1).find(".tobago-sheet-cell").eq(1).text().trim();
+  let $row1Col2 = $rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim();
+  let $row2Col0 = $rows().eq(2).find(".tobago-sheet-cell").eq(0).text().trim();
+  let $row2Col1 = $rows().eq(2).find(".tobago-sheet-cell").eq(1).text().trim();
+  let $row2Col2 = $rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim();
+  let $row3Col0 = $rows().eq(3).find(".tobago-sheet-cell").eq(0).text().trim();
+  let $row3Col1 = $rows().eq(3).find(".tobago-sheet-cell").eq(1).text().trim();
+  let $row3Col2 = $rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim();
 
   assert.equal($row0Col0, row0col0, "row0col0");
   assert.equal($row0Col1, row0col1, "row0col1");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/sheet-event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/sheet-event.test.js
index 671aba0..d538b8a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/sheet-event.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/sheet-event.test.js
@@ -16,13 +16,13 @@
  */
 
 QUnit.test("On click with ajax", function (assert) {
-  var $oneClickAjax = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:0");
-  var $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample0");
-  var $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample0");
-  var $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample0");
-  var $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  let $oneClickAjax = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:0");
+  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample0");
+  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample0");
+  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample0");
+  let $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $oneClickAjax().click();
   });
@@ -57,13 +57,13 @@ QUnit.test("On click with ajax", function (assert) {
 });
 
 QUnit.test("On click with full request", function (assert) {
-  var $oneClickFullRequest = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:1");
-  var $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample1");
-  var $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample1");
-  var $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample1");
-  var $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  let $oneClickFullRequest = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:1");
+  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample1");
+  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample1");
+  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample1");
+  let $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $oneClickFullRequest().click();
   });
@@ -98,13 +98,13 @@ QUnit.test("On click with full request", function (assert) {
 });
 
 QUnit.test("On double click with full request", function (assert) {
-  var $doubleClickFullRequest = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:2");
-  var $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample2");
-  var $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample2");
-  var $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample2");
-  var $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  let $doubleClickFullRequest = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:2");
+  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample2");
+  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample2");
+  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample2");
+  let $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $doubleClickFullRequest().click();
   });
@@ -139,15 +139,15 @@ QUnit.test("On double click with full request", function (assert) {
 });
 
 QUnit.test("Open popup on click with ajax", function (assert) {
-  var $radioButton = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:3");
-  var $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample3");
-  var $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample3");
-  var $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample3");
-  var $popup = jQueryFrameFn("#page\\:mainForm\\:popup");
-  var $name = jQueryFrameFn("#page\\:mainForm\\:popup\\:popupName\\:\\:field");
-  var $cancel = jQueryFrameFn("#page\\:mainForm\\:popup\\:cancel");
+  let $radioButton = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:3");
+  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample3");
+  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample3");
+  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample3");
+  let $popup = jQueryFrameFn("#page\\:mainForm\\:popup");
+  let $name = jQueryFrameFn("#page\\:mainForm\\:popup\\:popupName\\:\\:field");
+  let $cancel = jQueryFrameFn("#page\\:mainForm\\:popup\\:cancel");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $radioButton().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js
index 259aa3a..a63b0d2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/tree-select.test.js
@@ -16,14 +16,14 @@
  */
 
 QUnit.test("single: select Music, select Mathematics", function (assert) {
-  var $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  var $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  var $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  var $selectableSingle = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:1");
-  var $input = jQueryFrameFn(".tobago-treeSelect input");
+  let $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  let $selectableSingle = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:1");
+  let $input = jQueryFrameFn(".tobago-treeSelect input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
@@ -56,14 +56,14 @@ QUnit.test("single: select Music, select Mathematics", function (assert) {
 });
 
 QUnit.test("singleLeafOnly: select Classic, select Mathematics", function (assert) {
-  var $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  var $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  var $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  var $selectableSingleLeafOnly = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:2");
-  var $input = jQueryFrameFn(".tobago-treeSelect input");
+  let $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  let $selectableSingleLeafOnly = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:2");
+  let $input = jQueryFrameFn(".tobago-treeSelect input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
@@ -96,14 +96,14 @@ QUnit.test("singleLeafOnly: select Classic, select Mathematics", function (asser
 });
 
 QUnit.test("multi: select Music, select Mathematics, deselect Music", function (assert) {
-  var $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  var $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  var $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  var $selectableMulti = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:3");
-  var $input = jQueryFrameFn(".tobago-treeSelect input");
+  let $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  let $selectableMulti = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:3");
+  let $input = jQueryFrameFn(".tobago-treeSelect input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
@@ -143,14 +143,14 @@ QUnit.test("multi: select Music, select Mathematics, deselect Music", function (
 });
 
 QUnit.test("multiLeafOnly: select Classic, select Mathematics, deselect Classic", function (assert) {
-  var $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  var $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  var $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  var $selectableMultiLeafOnly = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:4");
-  var $input = jQueryFrameFn(".tobago-treeSelect input");
+  let $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  let $selectableMultiLeafOnly = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:4");
+  let $input = jQueryFrameFn(".tobago-treeSelect input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
@@ -190,15 +190,15 @@ QUnit.test("multiLeafOnly: select Classic, select Mathematics, deselect Classic"
 });
 
 QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", function (assert) {
-  var $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  var $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  var $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  var $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  var $selectableMultiCascade = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:5");
-  var $input = jQueryFrameFn(".tobago-treeSelect input");
+  let $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+  let $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  let $selectableMultiCascade = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:5");
+  let $input = jQueryFrameFn(".tobago-treeSelect input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $selectableNone().prop("checked", true).trigger("change");
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js
index dcd512b..d0ba1a2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("Required: Submit without content.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $textarea = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
-  var textareaValue = $textarea().val();
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $textarea = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
+  let textareaValue = $textarea().val();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $textarea().val("");
     $submit().click();
@@ -35,11 +35,11 @@ QUnit.test("Required: Submit without content.", function (assert) {
 });
 
 QUnit.test("Required: Submit with content.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $textarea = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $textarea = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $textarea().val("some content");
     $submit().click();
@@ -53,11 +53,11 @@ QUnit.test("Required: Submit with content.", function (assert) {
 });
 
 QUnit.test("Validate Length: Submit single character.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("a");
     $submit().click();
@@ -70,11 +70,11 @@ QUnit.test("Validate Length: Submit single character.", function (assert) {
 });
 
 QUnit.test("Validate Length: Submit two character.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("ab");
     $submit().click();
@@ -87,11 +87,11 @@ QUnit.test("Validate Length: Submit two character.", function (assert) {
 });
 
 QUnit.test("Validate Range: Submit no number.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("no number");
     $submit().click();
@@ -104,11 +104,11 @@ QUnit.test("Validate Range: Submit no number.", function (assert) {
 });
 
 QUnit.test("Validate Range: Submit number '2' which is out of range.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("2");
     $submit().click();
@@ -121,11 +121,11 @@ QUnit.test("Validate Range: Submit number '2' which is out of range.", function
 });
 
 QUnit.test("Validate Range: Submit number '78' which is out of range.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("78");
     $submit().click();
@@ -138,11 +138,11 @@ QUnit.test("Validate Range: Submit number '78' which is out of range.", function
 });
 
 QUnit.test("Validate Range: Submit number '64' which is within the range.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("64");
     $submit().click();
@@ -155,11 +155,11 @@ QUnit.test("Validate Range: Submit number '64' which is within the range.", func
 });
 
 QUnit.test("Regex Validation: Submit 'T' which violates the pattern.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("T");
     $submit().click();
@@ -172,11 +172,11 @@ QUnit.test("Regex Validation: Submit 'T' which violates the pattern.", function
 });
 
 QUnit.test("Regex Validation: Submit '3' which violates the pattern.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("3");
     $submit().click();
@@ -189,11 +189,11 @@ QUnit.test("Regex Validation: Submit '3' which violates the pattern.", function
 });
 
 QUnit.test("Regex Validation: Submit 'T3' which is accepted.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("T3");
     $submit().click();
@@ -206,11 +206,11 @@ QUnit.test("Regex Validation: Submit 'T3' which is accepted.", function (assert)
 });
 
 QUnit.test("Custom Validator: Submit rejected string.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("java");
     $submit().click();
@@ -223,11 +223,11 @@ QUnit.test("Custom Validator: Submit rejected string.", function (assert) {
 });
 
 QUnit.test("Custom Validator: Submit accepted string.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("tobago");
     $submit().click();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js
index 778d561..2d7c792 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js
@@ -16,11 +16,11 @@
  */
 
 QUnit.test("Required: Submit without content.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("");
     $submit().click();
@@ -33,11 +33,11 @@ QUnit.test("Required: Submit without content.", function (assert) {
 });
 
 QUnit.test("Required: Submit with content.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("some content");
     $submit().click();
@@ -50,11 +50,11 @@ QUnit.test("Required: Submit with content.", function (assert) {
 });
 
 QUnit.test("Length: Submit single character.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("a");
     $submit().click();
@@ -67,11 +67,11 @@ QUnit.test("Length: Submit single character.", function (assert) {
 });
 
 QUnit.test("Length: Submit three characters.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("abc");
     $submit().click();
@@ -84,11 +84,11 @@ QUnit.test("Length: Submit three characters.", function (assert) {
 });
 
 QUnit.test("Length: Submit five characters.", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val("abcde");
     $submit().click();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js
index f074810..1fdb668 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/form-required.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("submit inner form 1 without violations", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
-  var $form1SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:submit1");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
+  let $form1SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:submit1");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Alice");
     $form1SubmitButton().click();
@@ -36,13 +36,13 @@ QUnit.test("submit inner form 1 without violations", function (assert) {
 });
 
 QUnit.test("submit inner form 2, violate required field", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  var $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  var form2OutputFieldValue = $form2OutputField().text();
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  let $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  let form2OutputFieldValue = $form2OutputField().text();
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("");
   });
@@ -62,12 +62,12 @@ QUnit.test("submit inner form 2, violate required field", function (assert) {
 });
 
 QUnit.test("submit inner form 2 without violations", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  var $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  let $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("Bob");
   });
@@ -87,17 +87,17 @@ QUnit.test("submit inner form 2 without violations", function (assert) {
 });
 
 QUnit.test("submit outer form, violate both required fields", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("");
     $outerFormInputField().val("");
@@ -115,17 +115,17 @@ QUnit.test("submit outer form, violate both required fields", function (assert)
 });
 
 QUnit.test("submit outer form, violate required field in form 2", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("");
     $outerFormInputField().val("Charlie");
@@ -143,17 +143,17 @@ QUnit.test("submit outer form, violate required field in form 2", function (asse
 });
 
 QUnit.test("submit outer form, violate required field in outer form", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("Dave");
     $outerFormInputField().val("");
@@ -171,16 +171,16 @@ QUnit.test("submit outer form, violate required field in outer form", function (
 });
 
 QUnit.test("submit outer form without violations", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
-
-  var TTT = new TobagoTestTools(assert);
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Eve");
     $form2InputField().val("Frank");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/form-ajax.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/form-ajax.test.js
index 441c581..d4fc455 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/form-ajax.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/form-ajax.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("submit inner form 1 without violations", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:submit1");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:submit1");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Alice");
     $button().click();
@@ -37,14 +37,14 @@ QUnit.test("submit inner form 1 without violations", function (assert) {
 
 
 QUnit.test("submit inner form 2, violate required field", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form2OutputFieldValue = $form2OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("");
     $button().click();
@@ -59,12 +59,12 @@ QUnit.test("submit inner form 2, violate required field", function (assert) {
 });
 
 QUnit.test("submit inner form 2 without violations", function (assert) {
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form2InputField().val("Bob");
     $button().click();
@@ -79,20 +79,20 @@ QUnit.test("submit inner form 2 without violations", function (assert) {
 });
 
 QUnit.test("submit outer form, violate both required fields", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form1OutputFieldValue = $form1OutputField().text();
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = $form1OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Charlie");
     $form2InputField().val("");
@@ -113,20 +113,20 @@ QUnit.test("submit outer form, violate both required fields", function (assert)
 });
 
 QUnit.test("submit outer form, violate required field in form 2", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form1OutputFieldValue = $form1OutputField().text();
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = $form1OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Dave");
     $form2InputField().val("");
@@ -147,20 +147,20 @@ QUnit.test("submit outer form, violate required field in form 2", function (asse
 });
 
 QUnit.test("submit outer form, violate required field in outer form", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form1OutputFieldValue = $form1OutputField().text();
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = $form1OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Frank");
     $form2InputField().val("Grace");
@@ -181,16 +181,16 @@ QUnit.test("submit outer form, violate required field in outer form", function (
 });
 
 QUnit.test("submit outer form without violations", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Hank");
     $form2InputField().val("Irene");
@@ -211,20 +211,20 @@ QUnit.test("submit outer form without violations", function (assert) {
 });
 
 QUnit.test("submit inner forms, violate required field in form 2", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form1OutputFieldValue = $form1OutputField().text();
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = $form1OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Kate");
     $form2InputField().val("");
@@ -245,18 +245,18 @@ QUnit.test("submit inner forms, violate required field in form 2", function (ass
 });
 
 QUnit.test("submit inner forms without violations", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Mike");
     $form2InputField().val("Neil");
@@ -277,20 +277,20 @@ QUnit.test("submit inner forms without violations", function (assert) {
 });
 
 QUnit.test("submit outer value, violate required field", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form1OutputFieldValue = $form1OutputField().text();
-  var form2OutputFieldValue = $form2OutputField().text();
-  var outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = $form1OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
+  let outerFormOutputFieldValue = $outerFormOutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Oscar");
     $form2InputField().val("Penny");
@@ -311,19 +311,19 @@ QUnit.test("submit outer value, violate required field", function (assert) {
 });
 
 QUnit.test("submit outer value without violations", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  var $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  var $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
-  var $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
+  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  var form1OutputFieldValue = $form1OutputField().text();
-  var form2OutputFieldValue = $form2OutputField().text();
+  let form1OutputFieldValue = $form1OutputField().text();
+  let form2OutputFieldValue = $form2OutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Quin");
     $form2InputField().val("Sue");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js
index c29dbc5..a068974 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.test.js
@@ -16,14 +16,14 @@
  */
 
 QUnit.test("submit form 1", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
-  var $form1SubmitButton = jQueryFrameFn("#page\\:mainForm\\:form1\\:submit1");
-  var $form2OutputFieldValue = $form2OutputField().text();
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
+  let $form1SubmitButton = jQueryFrameFn("#page\\:mainForm\\:form1\\:submit1");
+  let $form2OutputFieldValue = $form2OutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Oliver");
     $form2InputField().val("Peter");
@@ -40,14 +40,14 @@ QUnit.test("submit form 1", function (assert) {
 });
 
 QUnit.test("submit form 2", function (assert) {
-  var $form1InputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
-  var $form2InputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
-  var $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
-  var $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
-  var $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:submit2");
-  var $form1OutputFieldValue = $form1OutputField().text();
+  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
+  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
+  let $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:submit2");
+  let $form1OutputFieldValue = $form1OutputField().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $form1InputField().val("Oliver");
     $form2InputField().val("Peter");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/for-each.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/for-each.test.js
index 977c906..d9a95ac 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/for-each.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/for-each.test.js
@@ -16,15 +16,15 @@
  */
 
 QUnit.test("Add a river and reset.", function (assert) {
-  var $name = jQueryFrameFn("#page\\:mainForm\\:add\\:inName\\:\\:field");
-  var $length = jQueryFrameFn("#page\\:mainForm\\:add\\:inLength\\:\\:field");
-  var $discharge = jQueryFrameFn("#page\\:mainForm\\:add\\:inDischarge\\:\\:field");
-  var $add = jQueryFrameFn("#page\\:mainForm\\:add\\:buttonAdd");
-  var $reset = jQueryFrameFn("#page\\:mainForm\\:reset\\:buttonReset");
-  var $forEachBoxes = jQueryFrameFn("#page\\:mainForm\\:forEach .tobago-box");
-  var $uiRepeatSections = jQueryFrameFn("#page\\:mainForm\\:uiRepeat .tobago-section");
+  let $name = jQueryFrameFn("#page\\:mainForm\\:add\\:inName\\:\\:field");
+  let $length = jQueryFrameFn("#page\\:mainForm\\:add\\:inLength\\:\\:field");
+  let $discharge = jQueryFrameFn("#page\\:mainForm\\:add\\:inDischarge\\:\\:field");
+  let $add = jQueryFrameFn("#page\\:mainForm\\:add\\:buttonAdd");
+  let $reset = jQueryFrameFn("#page\\:mainForm\\:reset\\:buttonReset");
+  let $forEachBoxes = jQueryFrameFn("#page\\:mainForm\\:forEach .tobago-box");
+  let $uiRepeatSections = jQueryFrameFn("#page\\:mainForm\\:uiRepeat .tobago-section");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $reset().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js
index 851cfdb..3f662e3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js
@@ -16,11 +16,11 @@
  */
 
 QUnit.test("Simple Collapsible Box: show -> hide transition", function (assert) {
-  var $show = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
-  var $content = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
+  let $content = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -39,11 +39,11 @@ QUnit.test("Simple Collapsible Box: show -> hide transition", function (assert)
 });
 
 QUnit.test("Simple Collapsible Box: hide -> show transition", function (assert) {
-  var $show = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
-  var $content = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
+  let $content = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -62,13 +62,13 @@ QUnit.test("Simple Collapsible Box: hide -> show transition", function (assert)
 });
 
 QUnit.test("Full Server Request: open both boxes", function (assert) {
-  var $show1 = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
-  var $show2 = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
-  var $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  var $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  var content2Length = $content2().length;
+  let $show1 = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
+  let $show2 = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
+  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  let content2Length = $content2().length;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show1().click();
   });
@@ -89,13 +89,13 @@ QUnit.test("Full Server Request: open both boxes", function (assert) {
 });
 
 QUnit.test("Full Server Request: open box 1, close box 2", function (assert) {
-  var $show1 = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
-  var $hide2 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
-  var $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  var $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  var content2Length = $content2().length;
+  let $show1 = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
+  let $hide2 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
+  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  let content2Length = $content2().length;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show1().click();
   });
@@ -116,13 +116,13 @@ QUnit.test("Full Server Request: open box 1, close box 2", function (assert) {
 });
 
 QUnit.test("Full Server Request: close box 1, open box 2", function (assert) {
-  var $hide1 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
-  var $show2 = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
-  var $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  var $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  var content2Length = $content2().length;
+  let $hide1 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
+  let $show2 = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
+  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  let content2Length = $content2().length;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide1().click();
   });
@@ -143,13 +143,13 @@ QUnit.test("Full Server Request: close box 1, open box 2", function (assert) {
 });
 
 QUnit.test("Full Server Request: close both boxes", function (assert) {
-  var $hide1 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
-  var $hide2 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
-  var $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  var $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  var content2Length = $content2().length;
+  let $hide1 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
+  let $hide2 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
+  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  let content2Length = $content2().length;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide1().click();
   });
@@ -170,11 +170,11 @@ QUnit.test("Full Server Request: close both boxes", function (assert) {
 });
 
 QUnit.test("Client Side: show -> hide transition", function (assert) {
-  var $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  var $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  let $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -191,11 +191,11 @@ QUnit.test("Client Side: show -> hide transition", function (assert) {
 });
 
 QUnit.test("Client Side: hide -> show transition", function (assert) {
-  var $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  var $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  let $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -212,14 +212,14 @@ QUnit.test("Client Side: hide -> show transition", function (assert) {
 });
 
 QUnit.test("Client Side: hide content and submit empty string", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  var $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inNoRequestBox\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:client\\:submitNoRequestBox");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  let $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inNoRequestBox\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:client\\:submitNoRequestBox");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -238,11 +238,11 @@ QUnit.test("Client Side: hide content and submit empty string", function (assert
 });
 
 QUnit.test("Ajax: show -> hide transition", function (assert) {
-  var $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -261,11 +261,11 @@ QUnit.test("Ajax: show -> hide transition", function (assert) {
 });
 
 QUnit.test("Ajax: hide -> show transition", function (assert) {
-  var $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -284,13 +284,13 @@ QUnit.test("Ajax: hide -> show transition", function (assert) {
 });
 
 QUnit.test("Ajax: hide content and submit empty string", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages .tobago-messages");
-  var $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
-  var $submit = jQueryFrameFn("#page\\:mainForm\\:ajax\\:submitAjaxBox");
+  let $messages = jQueryFrameFn("#page\\:messages .tobago-messages");
+  let $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  let $submit = jQueryFrameFn("#page\\:mainForm\\:ajax\\:submitAjaxBox");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js
index e10dbe0..09a7d4b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js
@@ -16,14 +16,14 @@
  */
 
 QUnit.test("Simple Popup", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $open = jQueryFrameFn("#page\\:mainForm\\:simple\\:open1");
-  var $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:simple\\:submitOnPage1");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:in1\\:\\:field");
-  var $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:submitOnPopup1");
-  var $close = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:close1");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $open = jQueryFrameFn("#page\\:mainForm\\:simple\\:open1");
+  let $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:simple\\:submitOnPage1");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:in1\\:\\:field");
+  let $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:submitOnPopup1");
+  let $close = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:close1");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $open().click();
   });
@@ -69,14 +69,14 @@ QUnit.test("Simple Popup", function (assert) {
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $open = jQueryFrameFn("#page\\:mainForm\\:server\\:open2");
-  var $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:server\\:submitOnPage2");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:in2\\:\\:field");
-  var $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:submitOnPopup2");
-  var $close = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:close2");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $open = jQueryFrameFn("#page\\:mainForm\\:server\\:open2");
+  let $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:server\\:submitOnPage2");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:in2\\:\\:field");
+  let $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:submitOnPopup2");
+  let $close = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:close2");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $open().click();
   });
@@ -122,15 +122,15 @@ QUnit.test("Full Server Request", function (assert) {
 });
 
 QUnit.test("Client Side", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $open = jQueryFrameFn("#page\\:mainForm\\:client\\:open3");
-  var $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:client\\:submitOnPage3");
-  var $popupCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:in3\\:\\:field");
-  var $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:submitOnPopup3");
-  var $close = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:close3");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $open = jQueryFrameFn("#page\\:mainForm\\:client\\:open3");
+  let $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:client\\:submitOnPage3");
+  let $popupCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:in3\\:\\:field");
+  let $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:submitOnPopup3");
+  let $close = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:close3");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $open().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js
index be1b29b..8648ce5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js
@@ -16,14 +16,14 @@
  */
 
 QUnit.test("Simple Panel", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
-  var $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:simple\\:simplePanel\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
+  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:simple\\:simplePanel\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -74,14 +74,14 @@ QUnit.test("Simple Panel", function (assert) {
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
-  var $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:server\\:serverPanel\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
+  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:server\\:serverPanel\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -132,14 +132,14 @@ QUnit.test("Full Server Request", function (assert) {
 });
 
 QUnit.test("Client Side", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
-  var $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPanel\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
+  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPanel\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -188,14 +188,14 @@ QUnit.test("Client Side", function (assert) {
 });
 
 QUnit.test("Ajax", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
-  var $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxPanel\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
+  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxPanel\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js
index 1b4110d..b42615b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js
@@ -16,14 +16,14 @@
  */
 
 QUnit.test("Simple Panel", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
-  var $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:simple\\:simpleSection\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
+  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:simple\\:simpleSection\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -74,14 +74,14 @@ QUnit.test("Simple Panel", function (assert) {
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
-  var $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:server\\:fullRequestSection\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
+  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:server\\:fullRequestSection\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -132,14 +132,14 @@ QUnit.test("Full Server Request", function (assert) {
 });
 
 QUnit.test("Client Side", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
-  var $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientSection\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
+  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientSection\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
@@ -188,14 +188,14 @@ QUnit.test("Client Side", function (assert) {
 });
 
 QUnit.test("Ajax", function (assert) {
-  var $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  var $submit = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
-  var $show = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
-  var $hide = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
-  var $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxSection\\:\\:collapse");
-  var $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
+  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
+  let $show = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
+  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
+  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxSection\\:\\:collapse");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $show().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.test.js
index 76319b6..021566c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.test.js
@@ -16,13 +16,13 @@
  */
 
 QUnit.test("Deprecated: 'Ma'", function (assert) {
-  var inputString = "Ma";
-  var expectedLength = 4;
+  let inputString = "Ma";
+  let expectedLength = 4;
 
-  var $in = jQueryFrameFn("#page\\:mainForm\\:deprecated\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:deprecated");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:deprecated\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:deprecated");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val(inputString).trigger('input');
   });
@@ -37,13 +37,13 @@ QUnit.test("Deprecated: 'Ma'", function (assert) {
 });
 
 QUnit.test("Replacement: 'Ma'", function (assert) {
-  var inputString = "Ma";
-  var expectedLength = 4;
+  let inputString = "Ma";
+  let expectedLength = 4;
 
-  var $in = jQueryFrameFn("#page\\:mainForm\\:replacement\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:replacement");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:replacement\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:replacement");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val(inputString).trigger('input');
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/suggest-quotMark.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/suggest-quotMark.test.js
index 424bc2b..aff2ed1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/suggest-quotMark.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/suggest-quotMark.test.js
@@ -16,38 +16,38 @@
  */
 
 QUnit.test("Basics: 'M'", function (assert) {
-  var inputString = "M";
-  var expectedLength = 3;
+  let inputString = "M";
+  let expectedLength = 3;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Ma'", function (assert) {
-  var inputString = "Ma";
-  var expectedLength = 2;
+  let inputString = "Ma";
+  let expectedLength = 2;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mar'", function (assert) {
-  var inputString = "Mar";
-  var expectedLength = 2;
+  let inputString = "Mar";
+  let expectedLength = 2;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mars'", function (assert) {
-  var inputString = "Mars";
-  var expectedLength = 1;
+  let inputString = "Mars";
+  let expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  var $in = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
-  var $suggestions = getSuggestions("#page\\:mainForm\\:input");
+  let $in = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
+  let $suggestions = getSuggestions("#page\\:mainForm\\:input");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in().val(inputString).trigger('input');
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/date.test.js
index c9b47b6..06ad80a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/date.test.js
@@ -16,8 +16,8 @@
  */
 
 QUnit.test("inputfield with label", function (assert) {
-  var $dateField = jQueryFrame("#page\\:mainForm\\:dateNoPattern\\:\\:field");
-  var $dateButton = jQueryFrame("#page\\:mainForm\\:dateNoPattern button");
+  let $dateField = jQueryFrame("#page\\:mainForm\\:dateNoPattern\\:\\:field");
+  let $dateButton = jQueryFrame("#page\\:mainForm\\:dateNoPattern button");
 
   assert.equal($dateField.val(), "");
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/date-pattern.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/date-pattern.test.js
index 4e914d9..ee28cfc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/date-pattern.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/date-pattern.test.js
@@ -30,10 +30,10 @@ TestDateTime = {};
 
 TestDateTime.testDate = function () {
 
-  var date;
-  var format = "dd.mm.yy";
-  var initial = "13.05.2014";
-  var result;
+  let date;
+  let format = "dd.mm.yy";
+  let initial = "13.05.2014";
+  let result;
 
   date = moment(initial, format);
   result = moment(date).format(format);
@@ -48,10 +48,10 @@ TestDateTime.testDate = function () {
 
 TestDateTime.testTime = function () {
 
-  var date;
-  var format = "HH:mm:ss";
-  var initial = "14:06:55";
-  var result;
+  let date;
+  let format = "HH:mm:ss";
+  let initial = "14:06:55";
+  let result;
 
   date = moment(initial, format);
   result = moment(date).format(format);
@@ -66,12 +66,12 @@ TestDateTime.testTime = function () {
 
 TestDateTime.testBoth = function () {
 
-  var date, dateT;
-  var formatD = "dd.mm.yy";
-  var formatT = "HH:mm:ss";
-  var initial = "13.05.2014 13:05:55";
-  var result;
-  var separator = " ";
+  let date, dateT;
+  let formatD = "dd.mm.yy";
+  let formatT = "HH:mm:ss";
+  let initial = "13.05.2014 13:05:55";
+  let result;
+  let separator = " ";
 
   date = moment(initial, formatD + ' ' +  formatT);
   dateT = {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/tabgroup-style.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/tabgroup-style.test.js
index 4f36139..4618db5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/tabgroup-style.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/tabgroup-style.test.js
@@ -16,16 +16,16 @@
  */
 
 QUnit.test("test numbers of tabgroupindex", function (assert) {
-  var $tabOne = jQueryFrame("#page\\:mainForm\\:tabOne");
-  var $tabTwo = jQueryFrame("#page\\:mainForm\\:tabTwo");
-  var $tabThree = jQueryFrame("#page\\:mainForm\\:tabThree");
-  var $tabFour = jQueryFrame("#page\\:mainForm\\:tabFour");
-  var $tabFive = jQueryFrame("#page\\:mainForm\\:tabFive");
-  var $tabOneContent = jQueryFrame("#page\\:mainForm\\:tabOne\\:\\:content");
-  var $tabTwoContent = jQueryFrame("#page\\:mainForm\\:tabTwo\\:\\:content");
-  var $tabThreeContent = jQueryFrame("#page\\:mainForm\\:tabThree\\:\\:content");
-  var $tabFourContent = jQueryFrame("#page\\:mainForm\\:tabFour\\:\\:content");
-  var $tabFiveContent = jQueryFrame("#page\\:mainForm\\:tabFive\\:\\:content");
+  let $tabOne = jQueryFrame("#page\\:mainForm\\:tabOne");
+  let $tabTwo = jQueryFrame("#page\\:mainForm\\:tabTwo");
+  let $tabThree = jQueryFrame("#page\\:mainForm\\:tabThree");
+  let $tabFour = jQueryFrame("#page\\:mainForm\\:tabFour");
+  let $tabFive = jQueryFrame("#page\\:mainForm\\:tabFive");
+  let $tabOneContent = jQueryFrame("#page\\:mainForm\\:tabOne\\:\\:content");
+  let $tabTwoContent = jQueryFrame("#page\\:mainForm\\:tabTwo\\:\\:content");
+  let $tabThreeContent = jQueryFrame("#page\\:mainForm\\:tabThree\\:\\:content");
+  let $tabFourContent = jQueryFrame("#page\\:mainForm\\:tabFour\\:\\:content");
+  let $tabFiveContent = jQueryFrame("#page\\:mainForm\\:tabFive\\:\\:content");
 
   assert.equal($tabOne.attr("tabgroupindex"), "0");
   assert.equal($tabTwo.attr("tabgroupindex"), "1");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/4050-ajax-dropdown/ajax-dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/4050-ajax-dropdown/ajax-dropdown.test.js
index 92f8ebb..4bcae10 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/4050-ajax-dropdown/ajax-dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/4050-ajax-dropdown/ajax-dropdown.test.js
@@ -16,12 +16,12 @@
  */
 
 QUnit.test("Execute 'AJAX' entry in dropdown menu", function (assert) {
-  var $dropdownMenuButton = jQueryFrameFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
-  var $ajaxEntry = jQueryFrameFn("#page\\:mainForm\\:ajaxEntry");
-  var $input = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
-  var $output = jQueryFrameFn("#page\\:mainForm\\:outputAjax .tobago-out");
+  let $dropdownMenuButton = jQueryFrameFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
+  let $ajaxEntry = jQueryFrameFn("#page\\:mainForm\\:ajaxEntry");
+  let $input = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+  let $output = jQueryFrameFn("#page\\:mainForm\\:outputAjax .tobago-out");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
     assert.equal($ajaxEntry().parents(".tobago-page-menuStore").length, 0, "Dropdown menu should be closed.");
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/button+link.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/button+link.test.js
index 901ff7b..1e85de2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/button+link.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button+link/button+link.test.js
@@ -16,33 +16,33 @@
  */
 
 QUnit.test("Standard Action Button", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:standardButtonAction");
-  var $destinationSection = jQueryFrameFn("#page\\:actionSection");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:standardButtonAction");
+  let $destinationSection = jQueryFrameFn("#page\\:actionSection");
   testStandardCommands($command, $destinationSection, assert);
 });
 
 QUnit.test("Standard Link Button", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:standardButtonLink");
-  var $destinationSection = jQueryFrameFn("#page\\:linkSection");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:standardButtonLink");
+  let $destinationSection = jQueryFrameFn("#page\\:linkSection");
   testStandardCommands($command, $destinationSection, assert);
 });
 
 QUnit.test("Standard Action Link", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:standardLinkAction");
-  var $destinationSection = jQueryFrameFn("#page\\:actionSection");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:standardLinkAction");
+  let $destinationSection = jQueryFrameFn("#page\\:actionSection");
   testStandardCommands($command, $destinationSection, assert);
 });
 
 QUnit.test("Standard Link Link", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:standardLinkLink");
-  var $destinationSection = jQueryFrameFn("#page\\:linkSection");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:standardLinkLink");
+  let $destinationSection = jQueryFrameFn("#page\\:linkSection");
   testStandardCommands($command, $destinationSection, assert);
 });
 
 function testStandardCommands($command, $destinationSection, assert) {
-  var $back = jQueryFrameFn("#page\\:back");
+  let $back = jQueryFrameFn("#page\\:back");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $command()[0].click();
   });
@@ -61,31 +61,31 @@ function testStandardCommands($command, $destinationSection, assert) {
 }
 
 QUnit.test("Target Action Button", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:targetButtonAction");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:targetButtonAction");
   testTargetCommands($command, "#textInput", "accessed by action", assert);
 });
 
 QUnit.test("Target Link Button", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:targetButtonLink");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:targetButtonLink");
   testTargetCommands($command, "#textInput", "accessed by link", assert);
 });
 
 QUnit.test("Target Action Link", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:targetLinkAction");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:targetLinkAction");
   testTargetCommands($command, "#textInput", "accessed by action", assert);
 });
 
 QUnit.test("Target Link Link", function (assert) {
-  var $command = jQueryFrameFn("#page\\:mainForm\\:targetLinkLink");
+  let $command = jQueryFrameFn("#page\\:mainForm\\:targetLinkLink");
   testTargetCommands($command, "#textInput", "accessed by link", assert);
 });
 
 QUnit.test("Style must not be a dropdown item", function (assert) {
   assert.expect(3);
 
-  var $dropdownMenu = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
-  var $styleAsItem = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
+  let $dropdownMenu = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
+  let $styleAsItem = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
 
   assert.equal($dropdownMenu().length, 1);
   assert.equal($styleAsItem().length, 0);
@@ -93,13 +93,13 @@ QUnit.test("Style must not be a dropdown item", function (assert) {
 });
 
 function testTargetCommands($command, targetTextInputSelector, expectedText, assert) {
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $command()[0].click();
   });
   TTT.waitMs(2000); //TobagoTestTools.waitForResponse() didn't recognize responses on a target frame, so we just wait
   TTT.asserts(1, function () {
-    var $targetTextInput = jQueryTargetFrame(targetTextInputSelector);
+    let $targetTextInput = jQueryTargetFrame(targetTextInputSelector);
     assert.equal($targetTextInput.val(), expectedText);
   });
   TTT.startTest();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/headings.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/headings.test.js
index cbdefcd..3146546 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/headings.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/headings.test.js
@@ -16,44 +16,44 @@
  */
 
 QUnit.test("Test h1", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link1");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink1");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link1");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink1");
   testFont(assert, $alink, $buttonlink);
 });
 
 QUnit.test("Test h2", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link2");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink2");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link2");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink2");
   testFont(assert, $alink, $buttonlink);
 });
 
 QUnit.test("Test h3", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link3");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink3");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link3");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink3");
   testFont(assert, $alink, $buttonlink);
 });
 
 QUnit.test("Test h4", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link4");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink4");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link4");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink4");
   testFont(assert, $alink, $buttonlink);
 });
 
 QUnit.test("Test h5", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link5");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink5");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link5");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink5");
   testFont(assert, $alink, $buttonlink);
 });
 
 QUnit.test("Test h6", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link6");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink6");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link6");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink6");
   testFont(assert, $alink, $buttonlink);
 });
 
 QUnit.test("Test no heading", function (assert) {
-  var $alink = jQueryFrameFn("#page\\:mainForm\\:link0");
-  var $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink0");
+  let $alink = jQueryFrameFn("#page\\:mainForm\\:link0");
+  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink0");
   testFont(assert, $alink, $buttonlink);
 });
 
@@ -68,12 +68,12 @@ function testFont(assert, $alink, $buttonlink) {
 }
 
 QUnit.test("Ajax reload for section 2", function (assert) {
-  var $reloadButton = jQueryFrameFn("#page\\:mainForm\\:reloadSection2");
-  var $section2Header = jQueryFrameFn("#page\\:mainForm\\:levelTwoSection h3");
-  var $timestamp = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
-  var firstTimestamp = $timestamp().text();
+  let $reloadButton = jQueryFrameFn("#page\\:mainForm\\:reloadSection2");
+  let $section2Header = jQueryFrameFn("#page\\:mainForm\\:levelTwoSection h3");
+  let $timestamp = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
+  let firstTimestamp = $timestamp().text();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
     assert.equal($section2Header().length, 1);
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/id-markup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/id-markup.test.js
index 55fd4f2..a35639d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/id-markup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/id-markup.test.js
@@ -18,10 +18,10 @@
 QUnit.test("No label set", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionNoLabel");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionNoLabel");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inNoLabel");
   assert.equal($label.length, 0);
@@ -34,10 +34,10 @@ QUnit.test("No label set", function (assert) {
 QUnit.test("labelLayout=none", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionNone");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionNone");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inNone");
   assert.equal($label.length, 0);
@@ -50,9 +50,9 @@ QUnit.test("labelLayout=none", function (assert) {
 QUnit.test("labelLayout=skip", function (assert) {
   assert.expect(3);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionSkip");
-  var $rootInput = $section.find(".tobago-section-content > input");
-  var $label = $section.find("label");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionSkip");
+  let $rootInput = $section.find(".tobago-section-content > input");
+  let $label = $section.find("label");
 
   assert.equal($label.length, 0);
   assert.equal($rootInput.attr('id'), "page:mainForm:inSkip");
@@ -63,10 +63,10 @@ QUnit.test("labelLayout=skip", function (assert) {
 QUnit.test("labelLayout=top", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionTop");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionTop");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inTop");
   assert.equal($label.attr('for'), "page:mainForm:inTop::field");
@@ -79,10 +79,10 @@ QUnit.test("labelLayout=top", function (assert) {
 QUnit.test("labelLayout=flowLeft", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlowLeft");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlowLeft");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inFlowLeft");
   assert.equal($label.attr('for'), "page:mainForm:inFlowLeft::field");
@@ -95,10 +95,10 @@ QUnit.test("labelLayout=flowLeft", function (assert) {
 QUnit.test("labelLayout=flowRight", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlowRight");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlowRight");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inFlowRight");
   assert.equal($label.attr('for'), "page:mainForm:inFlowRight::field");
@@ -111,10 +111,10 @@ QUnit.test("labelLayout=flowRight", function (assert) {
 QUnit.test("labelLayout=flexLeft", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlexLeft");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlexLeft");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inFlexLeft");
   assert.equal($label.attr('for'), "page:mainForm:inFlexLeft::field");
@@ -127,10 +127,10 @@ QUnit.test("labelLayout=flexLeft", function (assert) {
 QUnit.test("labelLayout=flexRight", function (assert) {
   assert.expect(5);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlexRight");
-  var $rootDiv = $section.find(".tobago-section-content > div");
-  var $label = $rootDiv.find("label");
-  var $input = $rootDiv.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlexRight");
+  let $rootDiv = $section.find(".tobago-section-content > div");
+  let $label = $rootDiv.find("label");
+  let $input = $rootDiv.find("input");
 
   assert.equal($rootDiv.attr('id'), "page:mainForm:inFlexRight");
   assert.equal($label.attr('for'), "page:mainForm:inFlexRight::field");
@@ -143,12 +143,12 @@ QUnit.test("labelLayout=flexRight", function (assert) {
 QUnit.test("labelLayout=segmentLeft", function (assert) {
   assert.expect(7);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionSegmentLeft");
-  var $segmentLayout = $section.find(".tobago-section-content > div");
-  var $labelSegment = $segmentLayout.find(".col-3 > div");
-  var $inputSegment = $segmentLayout.find(".col-9 > div");
-  var $label = $labelSegment.find("label");
-  var $input = $inputSegment.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionSegmentLeft");
+  let $segmentLayout = $section.find(".tobago-section-content > div");
+  let $labelSegment = $segmentLayout.find(".col-3 > div");
+  let $inputSegment = $segmentLayout.find(".col-9 > div");
+  let $label = $labelSegment.find("label");
+  let $input = $inputSegment.find("input");
 
   assert.equal($labelSegment.attr('id'), "page:mainForm:inSegmentLeft::label");
   assert.equal($label.attr('for'), "page:mainForm:inSegmentLeft::field");
@@ -163,12 +163,12 @@ QUnit.test("labelLayout=segmentLeft", function (assert) {
 QUnit.test("labelLayout=segmentRight", function (assert) {
   assert.expect(7);
 
-  var $section = jQueryFrame("#page\\:mainForm\\:sectionSegmentRight");
-  var $segmentLayout = $section.find(".tobago-section-content > div");
-  var $labelSegment = $segmentLayout.find(".col-3 > div");
-  var $inputSegment = $segmentLayout.find(".col-9 > div");
-  var $label = $labelSegment.find("label");
-  var $input = $inputSegment.find("input");
+  let $section = jQueryFrame("#page\\:mainForm\\:sectionSegmentRight");
+  let $segmentLayout = $section.find(".tobago-section-content > div");
+  let $labelSegment = $segmentLayout.find(".col-3 > div");
+  let $inputSegment = $segmentLayout.find(".col-9 > div");
+  let $label = $labelSegment.find("label");
+  let $input = $inputSegment.find("input");
 
   assert.equal($labelSegment.attr('id'), "page:mainForm:inSegmentRight::label");
   assert.equal($label.attr('for'), "page:mainForm:inSegmentRight::field");
@@ -183,6 +183,6 @@ QUnit.test("labelLayout=segmentRight", function (assert) {
 QUnit.test("Number of data-tobago-markup attributes", function (assert) {
   assert.expect(1);
 
-  var $dataTobagoMarkups = jQueryFrame("#page\\:content .tobago-section-content [data-tobago-markup]");
+  let $dataTobagoMarkups = jQueryFrame("#page\\:content .tobago-section-content [data-tobago-markup]");
   assert.equal($dataTobagoMarkups.length, 12, "Two for segment layout components, one for all other components");
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/labelLayoutTop.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/labelLayoutTop.test.js
index 4d507fa..3ea96a7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/labelLayoutTop.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/labelLayoutTop.test.js
@@ -81,8 +81,8 @@ QUnit.test("Check width for tc:textarea", function (assert) {
 });
 
 function testWidth(assert, idPart) {
-  var $compLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + " label");
-  var $compTopLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + "Top label");
+  let $compLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + " label");
+  let $compTopLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + "Top label");
 
   assert.equal($compLabel.width(), "155");
   assert.equal($compTopLabel.width(), $compTopLabel.width());
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/rendererBase-getCurrentValue.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/rendererBase-getCurrentValue.test.js
index 0513280..78e6cc4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/rendererBase-getCurrentValue.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/rendererBase-getCurrentValue.test.js
@@ -16,7 +16,7 @@
  */
 
 function test(assert, idSuffix, expectedText) {
-  var $out = jQueryFrame("#page\\:mainForm\\:" + idSuffix);
+  let $out = jQueryFrame("#page\\:mainForm\\:" + idSuffix);
   assert.equal($out.text().trim(), expectedText);
 }
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/ajax-execute.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/ajax-execute.test.js
index 5134206..cb76dc8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/ajax-execute.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/ajax-execute.test.js
@@ -16,15 +16,15 @@
  */
 
 QUnit.test("ajax excecute", function (assert) {
-  var $in1 = jQueryFrameFn("#page\\:mainForm\\:in1\\:\\:field");
-  var $in2 = jQueryFrameFn("#page\\:mainForm\\:in2\\:\\:field");
-  var $in3 = jQueryFrameFn("#page\\:mainForm\\:in3\\:\\:field");
-  var $in4 = jQueryFrameFn("#page\\:mainForm\\:in4\\:\\:field");
-  var $clearButton = jQueryFrameFn("#page\\:mainForm\\:clear");
-  var $submitButton = jQueryFrameFn("#page\\:mainForm\\:submit");
-  var $reloadButton = jQueryFrameFn("#page\\:mainForm\\:reload");
+  let $in1 = jQueryFrameFn("#page\\:mainForm\\:in1\\:\\:field");
+  let $in2 = jQueryFrameFn("#page\\:mainForm\\:in2\\:\\:field");
+  let $in3 = jQueryFrameFn("#page\\:mainForm\\:in3\\:\\:field");
+  let $in4 = jQueryFrameFn("#page\\:mainForm\\:in4\\:\\:field");
+  let $clearButton = jQueryFrameFn("#page\\:mainForm\\:clear");
+  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let $reloadButton = jQueryFrameFn("#page\\:mainForm\\:reload");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $in1().val("a");
     $in2().val("b");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/ajax-special-character.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/ajax-special-character.test.js
index e406154..2280556 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/ajax-special-character.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/ajax-special-character.test.js
@@ -16,16 +16,16 @@
  */
 
 QUnit.test("ajax excecute", function (assert) {
-  var $timestamp = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
-  var $text = jQueryFrameFn("#page\\:mainForm\\:outText span");
-  var $tip = jQueryFrameFn("#page\\:mainForm\\:outTip span");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:ajaxButton");
+  let $timestamp = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
+  let $text = jQueryFrameFn("#page\\:mainForm\\:outText span");
+  let $tip = jQueryFrameFn("#page\\:mainForm\\:outTip span");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:ajaxButton");
 
-  var timestampValue = $timestamp().text();
-  var textValue = $text().text();
-  var tipValue = $tip().attr('title');
+  let timestampValue = $timestamp().text();
+  let textValue = $text().text();
+  let tipValue = $tip().attr('title');
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $button().click();
   });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
index dab79b2..62f7552 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
@@ -16,19 +16,19 @@
  */
 
 QUnit.test("tc:button", function (assert) {
-  var eventNames = ["click", "dblclick", "focus", "blur"];
-  var $eventComponent = jQueryFrameFn("#page\\:mainForm\\:buttonevent");
-  var $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:buttonajax");
+  let eventNames = ["click", "dblclick", "focus", "blur"];
+  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:buttonevent");
+  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:buttonajax");
   testEvent(assert, "button", eventNames, $eventComponent, $ajaxComponent, null);
 });
 
 QUnit.test("tc:in", function (assert) {
-  var eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  var $eventComponent = jQueryFrameFn("#page\\:mainForm\\:inevent\\:\\:field");
-  var $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:inajax\\:\\:field");
-  var changeValue = function ($component) {
-    var oldValue = $component().val();
-    var newValue = "hello";
+  let eventNames = ["change", "click", "dblclick", "focus", "blur"];
+  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:inevent\\:\\:field");
+  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:inajax\\:\\:field");
+  let changeValue = function ($component) {
+    let oldValue = $component().val();
+    let newValue = "hello";
     if (oldValue === "hello") {
       newValue = "hello there!"
     }
@@ -38,18 +38,18 @@ QUnit.test("tc:in", function (assert) {
 });
 
 QUnit.test("tc:row", function (assert) {
-  var eventNames = ["click", "dblclick"];
-  var $eventComponent = jQueryFrameFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
-  var $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
+  let eventNames = ["click", "dblclick"];
+  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
+  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
   testEvent(assert, "row", eventNames, $eventComponent, $ajaxComponent, null);
 });
 
 QUnit.test("tc:selectBooleanCheckbox", function (assert) {
-  var eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  var $eventComponent = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
-  var $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
-  var changeValue = function ($component) {
-    var currentEvent = jQueryFrame("#page\\:mainForm\\:outEventName span").text();
+  let eventNames = ["change", "click", "dblclick", "focus", "blur"];
+  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
+  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
+  let changeValue = function ($component) {
+    let currentEvent = jQueryFrame("#page\\:mainForm\\:outEventName span").text();
     if (currentEvent !== "click") {
       $component().prop("checked", !$component().prop("checked"));
     }
@@ -58,12 +58,12 @@ QUnit.test("tc:selectBooleanCheckbox", function (assert) {
 });
 
 QUnit.test("tc:textarea", function (assert) {
-  var eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  var $eventComponent = jQueryFrameFn("#page\\:mainForm\\:textareaevent\\:\\:field");
-  var $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:textareaajax\\:\\:field");
-  var changeValue = function ($component) {
-    var oldValue = $component().val();
-    var newValue = "hello";
+  let eventNames = ["change", "click", "dblclick", "focus", "blur"];
+  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:textareaevent\\:\\:field");
+  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:textareaajax\\:\\:field");
+  let changeValue = function ($component) {
+    let oldValue = $component().val();
+    let newValue = "hello";
     if (oldValue === "hello") {
       newValue = "hello there!"
     }
@@ -73,15 +73,15 @@ QUnit.test("tc:textarea", function (assert) {
 });
 
 function testEvent(assert, componentName, eventNames, $eventComponent, $ajaxComponent, changeValueFunc) {
-  var oldActionCount;
-  var oldActionListenerCount;
-  var oldAjaxListenerCount;
-  var oldValueChangeListenerCount;
-  var oldTimestamp;
+  let oldActionCount;
+  let oldActionListenerCount;
+  let oldAjaxListenerCount;
+  let oldValueChangeListenerCount;
+  let oldTimestamp;
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   for (i = 0; i < eventNames.length; i++) {
-    var eventName = eventNames[i];
+    let eventName = eventNames[i];
 
     TTT.action(function () {
       activateComponent(componentName, eventName);
@@ -147,7 +147,7 @@ function activateComponent(componentName, eventName) {
   jQueryFrame("#page\\:mainForm\\:componentTable .tobago-sheet-row").each(function () {
     if (jQuery(this).find("td").eq(0).find(".tobago-out").text() === componentName) {
       jQuery(this).find("button").each(function () {
-        var id = jQuery(this).attr("id");
+        let id = jQuery(this).attr("id");
         if (id !== undefined && id.indexOf(eventName + "Behavior") >= 0) {
           this.click();
         }
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/behavior.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/behavior.test.js
index 345c1dc..1613f8b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/behavior.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/behavior.test.js
@@ -16,10 +16,10 @@
  */
 
 QUnit.test("Simple Event", function (assert) {
-  var $button = jQueryFrameFn("#page\\:mainForm\\:simpleEvent");
-  var oldCounterValues = getCounterValues();
+  let $button = jQueryFrameFn("#page\\:mainForm\\:simpleEvent");
+  let oldCounterValues = getCounterValues();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $button().click();
   });
@@ -31,10 +31,10 @@ QUnit.test("Simple Event", function (assert) {
 });
 
 QUnit.test("Simple Ajax", function (assert) {
-  var $button = jQueryFrameFn("#page\\:mainForm\\:simpleAjax");
-  var oldCounterValues = getCounterValues();
+  let $button = jQueryFrameFn("#page\\:mainForm\\:simpleAjax");
+  let oldCounterValues = getCounterValues();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $button().click();
   });
@@ -46,10 +46,10 @@ QUnit.test("Simple Ajax", function (assert) {
 });
 
 QUnit.test("Simple EventAjax", function (assert) {
-  var $button = jQueryFrameFn("#page\\:mainForm\\:simpleEventAjax");
-  var oldCounterValues = getCounterValues();
+  let $button = jQueryFrameFn("#page\\:mainForm\\:simpleEventAjax");
+  let oldCounterValues = getCounterValues();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $button().click();
   });
@@ -61,44 +61,44 @@ QUnit.test("Simple EventAjax", function (assert) {
 });
 
 QUnit.test("Advanced Button: Option 1", function (assert) {
-  var $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
   testEventOption(assert, $option, $button, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
 });
 
 QUnit.test("Advanced Button: Option 2", function (assert) {
-  var $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
 
   testAjaxOption(assert, $option, $button, "dblclick", 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1);
 });
 
 QUnit.test("Advanced Button: Option 3", function (assert) {
-  var $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
-  var $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
+  let $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
   testAjaxOption(assert, $option, $button, "click", 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1);
 });
 
 QUnit.test("Row: Option 1", function (assert) {
-  var $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
-  var $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
+  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
+  let $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
   testEventOption(assert, $option, $row, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
 });
 
 QUnit.test("Row: Option 2", function (assert) {
-  var $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
-  var $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
+  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
+  let $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
   testAjaxOption(assert, $option, $row, "dblclick", 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1);
 });
 
 QUnit.test("Row: Option 3", function (assert) {
-  var $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
-  var $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
+  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
+  let $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
   testAjaxOption(assert, $option, $row, "click", 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1);
 });
 
 QUnit.test("Input: Click Event", function (assert) {
-  var $input = jQueryFrameFn("#page\\:mainForm\\:inputClick\\:\\:field");
+  let $input = jQueryFrameFn("#page\\:mainForm\\:inputClick\\:\\:field");
   testInputSection(assert, $input, "click");
 });
 
@@ -107,11 +107,11 @@ function testEventOption(assert, $option, $component, event,
                          action1Plus, actionListener1Plus, ajaxListener1Plus,
                          action2Plus, actionListener2Plus, ajaxListener2Plus,
                          action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
-  var $operationOut = jQueryFrameFn("#page\\:mainForm\\:operationOut");
-  var oldCounterValues = getCounterValues();
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  let $operationOut = jQueryFrameFn("#page\\:mainForm\\:operationOut");
+  let oldCounterValues = getCounterValues();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -144,11 +144,11 @@ function testAjaxOption(assert, $option, $component, event,
                         action1Plus, actionListener1Plus, ajaxListener1Plus,
                         action2Plus, actionListener2Plus, ajaxListener2Plus,
                         action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
-  var $operationOut = jQueryFrameFn("#page\\:mainForm\\:operationOut");
-  var oldCounterValues = getCounterValues();
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  let $operationOut = jQueryFrameFn("#page\\:mainForm\\:operationOut");
+  let oldCounterValues = getCounterValues();
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -177,9 +177,9 @@ function testAjaxOption(assert, $option, $component, event,
 }
 
 function testInputSection(assert, $input, eventName) {
-  var $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  let $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
 
-  var TTT = new TobagoTestTools(assert);
+  let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
     $hide().click();
   });
@@ -198,20 +198,20 @@ function testInputSection(assert, $input, eventName) {
 }
 
 function getCounterValues() {
-  var buttonActionCounter = jQueryFrame("#page\\:mainForm\\:buttonActionCounter.tobago-out").text();
-  var buttonActionListenerCounter = jQueryFrame("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out").text();
+  let buttonActionCounter = jQueryFrame("#page\\:mainForm\\:buttonActionCounter.tobago-out").text();
+  let buttonActionListenerCounter = jQueryFrame("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out").text();
 
-  var actionCount1 = jQueryFrame("#page\\:mainForm\\:actionCounter1.tobago-out").text();
-  var actionListenerCount1 = jQueryFrame("#page\\:mainForm\\:actionListenerCounter1.tobago-out").text();
-  var ajaxListenerCount1 = jQueryFrame("#page\\:mainForm\\:ajaxListenerCounter1.tobago-out").text();
+  let actionCount1 = jQueryFrame("#page\\:mainForm\\:actionCounter1.tobago-out").text();
+  let actionListenerCount1 = jQueryFrame("#page\\:mainForm\\:actionListenerCounter1.tobago-out").text();
+  let ajaxListenerCount1 = jQueryFrame("#page\\:mainForm\\:ajaxListenerCounter1.tobago-out").text();
 
-  var actionCount2 = jQueryFrame("#page\\:mainForm\\:actionCounter2.tobago-out").text();
-  var actionListenerCount2 = jQueryFrame("#page\\:mainForm\\:actionListenerCounter2.tobago-out").text();
-  var ajaxListenerCount2 = jQueryFrame("#page\\:mainForm\\:ajaxListenerCounter2.tobago-out").text();
+  let actionCount2 = jQueryFrame("#page\\:mainForm\\:actionCounter2.tobago-out").text();
+  let actionListenerCount2 = jQueryFrame("#page\\:mainForm\\:actionListenerCounter2.tobago-out").text();
+  let ajaxListenerCount2 = jQueryFrame("#page\\:mainForm\\:ajaxListenerCounter2.tobago-out").text();
 
-  var actionCount3 = jQueryFrame("#page\\:mainForm\\:actionCounter3.tobago-out").text();
-  var actionListenerCount3 = jQueryFrame("#page\\:mainForm\\:actionListenerCounter3.tobago-out").text();
-  var ajaxListenerCount3 = jQueryFrame("#page\\:mainForm\\:ajaxListenerCounter3.tobago-out").text();
+  let actionCount3 = jQueryFrame("#page\\:mainForm\\:actionCounter3.tobago-out").text();
+  let actionListenerCount3 = jQueryFrame("#page\\:mainForm\\:actionListenerCounter3.tobago-out").text();
+  let ajaxListenerCount3 = jQueryFrame("#page\\:mainForm\\:ajaxListenerCounter3.tobago-out").text();
 
   return [buttonActionCounter, buttonActionListenerCounter,
     actionCount1, actionListenerCount1, ajaxListenerCount1,
@@ -224,7 +224,7 @@ function compareCounterValues(assert, oldCounterValues,
                               action1Plus, actionListener1Plus, ajaxListener1Plus,
                               action2Plus, actionListener2Plus, ajaxListener2Plus,
                               action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  var newCounterValues = getCounterValues();
+  let newCounterValues = getCounterValues();
 
   assert.equal(parseInt(newCounterValues[0]), parseInt(oldCounterValues[0]) + buttonActionPlus);
   assert.equal(parseInt(newCounterValues[1]), parseInt(oldCounterValues[1]) + buttonActionListenerPlus);
@@ -240,6 +240,6 @@ function compareCounterValues(assert, oldCounterValues,
 }
 
 function isOperationTestBoxCollapsed() {
-  var $operationOut = jQueryFrame("#page\\:mainForm\\:operationOut");
+  let $operationOut = jQueryFrame("#page\\:mainForm\\:operationOut");
   return $operationOut.length === 0;
 }
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.test.js
index 8c7b8d1..266121e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.test.js
@@ -21,8 +21,8 @@ QUnit.test("inputfield with label", function (assert) {
 
   function testValueEquals(id) {
 
-    var $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
-    var $label = jQueryFrame("[for='"+id+"']");
+    let $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
+    let $label = jQueryFrame("[for='"+id+"']");
     assert.equal($field.val(), $label.text());
   }
 
@@ -40,8 +40,8 @@ QUnit.test("inputfield with label", function (assert) {
 
   function testValueEquals(id) {
 
-    var $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
-    var $label = jQueryFrame("[for='"+id+"']");
+    let $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
+    let $label = jQueryFrame("[for='"+id+"']");
     assert.equal($field.attr("id"), $label.text());
   }
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/error/error.test.js b/tobago-example/tobago-example-demo/src/main/webapp/error/error.test.js
index 9dd2bb7..27da397 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/error/error.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/error/error.test.js
@@ -16,11 +16,11 @@
  */
 
 QUnit.test("has no exception", function (assert) {
-  var $error = jQueryFrame("#page\\:mainForm\\:errorSection .tobago-section-header span");
+  let $error = jQueryFrame("#page\\:mainForm\\:errorSection .tobago-section-header span");
   assert.notEqual($error.text(), "An error has occurred!");
 });
 
 QUnit.test("has no 404", function (assert) {
-  var $error404 = jQueryFrame("#page\\:mainForm\\:pageNotFoundMessage span");
+  let $error404 = jQueryFrame("#page\\:mainForm\\:pageNotFoundMessage span");
   assert.notEqual($error404.text(), "The page was not found!");
 });
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
index d688854..a091dc4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
@@ -26,12 +26,12 @@ function jQueryFrameFn(expression) {
 }
 
 QUnit.test("wait for test", function (assert) {
-  var done = assert.async();
+  let done = assert.async();
 
-  var startTime = new Date().getTime();
-  var contentWindowName = "";
-  var waitingDone = false;
-  var interval = setInterval(function () {
+  let startTime = new Date().getTime();
+  let contentWindowName = "";
+  let waitingDone = false;
+  let interval = setInterval(function () {
     contentWindowName = document.getElementById("page:testframe").contentWindow.name;
     waitingDone = (contentWindowName !== "page:testframe" && contentWindowName !== "ds-tempWindowId")
         || new RegExp('[\?&]base=([^&#]*)').exec(window.location.href)[1].indexOf("error%2F") === 0;
@@ -45,16 +45,16 @@ QUnit.test("wait for test", function (assert) {
 
 QUnit.test("duplicated IDs", function (assert) {
   function getDuplicatedIDs() {
-    var duplicatedIDs = [];
+    let duplicatedIDs = [];
     jQueryFrame('[id]').each(function () {
-      var ids = jQueryFrame('[id="' + this.id + '"]');
+      let ids = jQueryFrame('[id="' + this.id + '"]');
       if (ids.length > 1 && ids[0] === this)
         duplicatedIDs.push(this.id);
     });
     return duplicatedIDs;
   }
 
-  var duplicatedIDs = getDuplicatedIDs();
+  let duplicatedIDs = getDuplicatedIDs();
   assert.equal(duplicatedIDs.length, 0, "duplicated IDs are: " + duplicatedIDs);
 });
 
@@ -95,14 +95,14 @@ TobagoTestTools.prototype = {
     })
   },
   startTest: function () {
-    var steps = this.steps.slice(0);
-    var stepStarted = 0;
-    var stepFinished = 0;
-    var responses = 0;
-    var timeoutTimestamp = Date.now();
+    let steps = this.steps.slice(0);
+    let stepStarted = 0;
+    let stepFinished = 0;
+    let responses = 0;
+    let timeoutTimestamp = Date.now();
 
     function getAssertExpect() {
-      var expect = 0;
+      let expect = 0;
       steps.forEach(function (step) {
         if (step.type === TobagoTestTools.stepType.ASSERTS) {
           expect += step.numOfAssertions;
@@ -112,7 +112,7 @@ TobagoTestTools.prototype = {
     }
 
     function getAssertAsync() {
-      var async = 0;
+      let async = 0;
       steps.forEach(function (step) {
         if (step.type === TobagoTestTools.stepType.ASSERTS) {
           async++;
@@ -122,8 +122,8 @@ TobagoTestTools.prototype = {
     }
 
     this.assert.expect(getAssertExpect());
-    var done = this.assert.async(getAssertAsync());
-    var assert = this.assert;
+    let done = this.assert.async(getAssertAsync());
+    let assert = this.assert;
 
     function isFinished() {
       return stepStarted >= steps.length && stepFinished >= steps.length;

-- 
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.