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/27 12:34:23 UTC

[myfaces-tobago] branch master updated: Refactor TobagoTestTools and QUnit tests

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


The following commit(s) were added to refs/heads/master by this push:
     new b4a7777  Refactor TobagoTestTools and QUnit tests
b4a7777 is described below

commit b4a7777f47c1a6171babe4a2f8d24c1457827465
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Jun 27 14:33:40 2018 +0200

    Refactor TobagoTestTools and QUnit tests
    
    * move TobagoTestTools into own project
    * rename TobagoTestTools to TobagoTestTool
    * use 'var' instead of 'let' (it's not safe yet; revert 2e1fa9fba080697ad9b461d6c716f2d5fe67723a)
---
 tobago-example/tobago-example-demo/pom.xml         |   5 +
 .../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 +--
 .../date-tobagoConverter.test.js                   |  94 ++++-----
 .../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          | 195 +------------------
 .../tobago-example-demo/src/main/webapp/test.xhtml |   1 +
 tobago-tool/pom.xml                                |   1 +
 tobago-tool/{ => tobago-tool-test}/pom.xml         |  19 +-
 .../resources/tobago/test/tobago-test-tool.js      |  87 +++------
 51 files changed, 1081 insertions(+), 1301 deletions(-)

diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index d546e34..582e19c 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -173,6 +173,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-tool-test</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
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 c2bf26d..d2e6110 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);
 
-  let titleOfFirstSectionHeader = jQueryFrame(".tobago-section-header:first span").text();
+  var 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 be1a04e..ff27e5a 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) {
-  let labelFn = jQueryFrameFn("#page\\:mainForm\\:iNormal > label");
-  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:iNormal\\:\\:field");
+  var labelFn = jQueryFrameFn("#page\\:mainForm\\:iNormal > label");
+  var inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:iNormal\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(2, function () {
     assert.equal(labelFn().text(), "Input");
     assert.equal(inputFieldFn().val(), "Some Text");
@@ -34,10 +34,10 @@ QUnit.test("inputfield with label", function (assert) {
 });
 
 QUnit.test("ajax change event", function (assert) {
-  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
-  let outputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outputAjax span:first");
+  var inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+  var outputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outputAjax span:first");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(2, function () {
     assert.equal(inputFieldFn().val(), "");
     assert.equal(outputFieldFn().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 c17a5eb..ec56d99 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) {
-  let inputString = "M";
-  let expectedLength = 10;
+  var inputString = "M";
+  var expectedLength = 10;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Ma'", function (assert) {
-  let inputString = "Ma";
-  let expectedLength = 4;
+  var inputString = "Ma";
+  var expectedLength = 4;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mar'", function (assert) {
-  let inputString = "Mar";
-  let expectedLength = 1;
+  var inputString = "Mar";
+  var expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mars'", function (assert) {
-  let inputString = "Mars";
-  let expectedLength = 1;
+  var inputString = "Mars";
+  var expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val(inputString).trigger('input');
   });
@@ -62,10 +62,10 @@ function testMarsBasics(assert, inputString, expectedLength) {
 }
 
 QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().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) {
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
-  let suggestionDelay = 2000;
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  var suggestionDelay = 2000;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("C").trigger('input');
   });
@@ -104,12 +104,12 @@ QUnit.test("Advanced: 'C'", function (assert) {
 });
 
 QUnit.test("Advanced: 'Ca'", function (assert) {
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
-  let suggestionDelay = 2000;
-  let startTime = Date.now();
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  var suggestionDelay = 2000;
+  var startTime = Date.now();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("Ca").trigger('input');
   });
@@ -130,10 +130,10 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
 });
 
 QUnit.test("Client side: 'Ju'", function (assert) {
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().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 7c99449..17c194d 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(dateFieldFn) {
-  let tobagoToday = dateFieldFn().data("tobago-today");
-  let todayArray = tobagoToday.split("-");
+  var tobagoToday = dateFieldFn().data("tobago-today");
+  var todayArray = tobagoToday.split("-");
   return todayArray[2] + "." + todayArray[1] + "." + todayArray[0];
 }
 
 QUnit.test("date with label", function (assert) {
   assert.expect(5);
 
-  let labelFn = jQueryFrameFn("#page\\:mainForm\\:dNormal > label");
-  let dateFieldFn = jQueryFrameFn("#page\\:mainForm\\:dNormal\\:\\:field");
-  let dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:dNormal button");
-  let dayTodayFn = jQueryFrameFn(".day.today");
-  let today = getToday(dateFieldFn);
+  var labelFn = jQueryFrameFn("#page\\:mainForm\\:dNormal > label");
+  var dateFieldFn = jQueryFrameFn("#page\\:mainForm\\:dNormal\\:\\:field");
+  var dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:dNormal button");
+  var dayTodayFn = jQueryFrameFn(".day.today");
+  var today = getToday(dateFieldFn);
 
   assert.equal(labelFn().text(), "Date");
   assert.equal(dateFieldFn().val(), today);
@@ -44,13 +44,13 @@ QUnit.test("date with label", function (assert) {
 });
 
 QUnit.test("date+time pattern", function (assert) {
-  let dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
-  let datepickerFn = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  let firstLiFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
-  let lastLiFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
-  let togglePickerButtonFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .picker-switch a");
+  var dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
+  var datepickerFn = jQueryFrameFn(".bootstrap-datetimepicker-widget");
+  var firstLiFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
+  var lastLiFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
+  var togglePickerButtonFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .picker-switch a");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     dateButtonFn().click();
   });
@@ -74,15 +74,15 @@ QUnit.test("date+time pattern", function (assert) {
 });
 
 QUnit.test("submit", function (assert) {
-  let dateFieldFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
-  let dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input button");
-  let outFieldFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:output span");
-  let submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:button");
-  let widgetFn = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  let daysFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .day");
-  let day22 = 0;
+  var dateFieldFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
+  var dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input button");
+  var outFieldFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:output span");
+  var submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:button");
+  var widgetFn = jQueryFrameFn(".bootstrap-datetimepicker-widget");
+  var daysFn = jQueryFrameFn(".bootstrap-datetimepicker-widget .day");
+  var day22 = 0;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(2, function () {
     assert.equal(dateFieldFn().val(), "22.05.2016");
     assert.equal(outFieldFn().text(), "22.05.2016");
@@ -118,13 +118,13 @@ QUnit.test("submit", function (assert) {
 });
 
 QUnit.test("ajax", function (assert) {
-  let dateFieldFn = jQueryFrameFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
-  let dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:ajaxinput button");
-  let outFieldFn = jQueryFrameFn("#page\\:mainForm\\:outputfield span");
-  let widgetFn = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  let today = getToday(dateFieldFn);
+  var dateFieldFn = jQueryFrameFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
+  var dateButtonFn = jQueryFrameFn("#page\\:mainForm\\:ajaxinput button");
+  var outFieldFn = jQueryFrameFn("#page\\:mainForm\\:outputfield span");
+  var widgetFn = jQueryFrameFn(".bootstrap-datetimepicker-widget");
+  var today = getToday(dateFieldFn);
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(2, function () {
     assert.equal(dateFieldFn().val(), "");
     assert.equal(outFieldFn().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 4500622..826b250 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) {
-  let selectAFn = jQueryFrameFn("#page\\:mainForm\\:selectA input");
-  let selectBFn = jQueryFrameFn("#page\\:mainForm\\:selectB input");
-  let selectCFn = jQueryFrameFn("#page\\:mainForm\\:selectC input");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
+  var selectAFn = jQueryFrameFn("#page\\:mainForm\\:selectA input");
+  var selectBFn = jQueryFrameFn("#page\\:mainForm\\:selectB input");
+  var selectCFn = jQueryFrameFn("#page\\:mainForm\\:selectC input");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectAFn().prop("checked", true);
     selectBFn().prop("checked", false);
@@ -37,13 +37,13 @@ QUnit.test("submit: select A", function (assert) {
 });
 
 QUnit.test("submit: select B and C", function (assert) {
-  let selectAFn = jQueryFrameFn("#page\\:mainForm\\:selectA input");
-  let selectBFn = jQueryFrameFn("#page\\:mainForm\\:selectB input");
-  let selectCFn = jQueryFrameFn("#page\\:mainForm\\:selectC input");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
+  var selectAFn = jQueryFrameFn("#page\\:mainForm\\:selectA input");
+  var selectBFn = jQueryFrameFn("#page\\:mainForm\\:selectB input");
+  var selectCFn = jQueryFrameFn("#page\\:mainForm\\:selectC input");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectAFn().prop("checked", false);
     selectBFn().prop("checked", true);
@@ -58,10 +58,10 @@ QUnit.test("submit: select B and C", function (assert) {
 });
 
 QUnit.test("ajax: select D", function (assert) {
-  let selectDFn = jQueryFrameFn("#page\\:mainForm\\:selectD input");
-  let outputDFn = jQueryFrameFn("#page\\:mainForm\\:outputD span");
+  var selectDFn = jQueryFrameFn("#page\\:mainForm\\:selectD input");
+  var outputDFn = jQueryFrameFn("#page\\:mainForm\\:outputD span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectDFn().prop("checked", true).trigger("change");
   });
@@ -73,10 +73,10 @@ QUnit.test("ajax: select D", function (assert) {
 });
 
 QUnit.test("ajax: deselect D", function (assert) {
-  let selectDFn = jQueryFrameFn("#page\\:mainForm\\:selectD input");
-  let outputDFn = jQueryFrameFn("#page\\:mainForm\\:outputD span");
+  var selectDFn = jQueryFrameFn("#page\\:mainForm\\:selectD input");
+  var outputDFn = jQueryFrameFn("#page\\:mainForm\\:outputD span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectDFn().prop("checked", false).trigger("change");
   });
@@ -88,10 +88,10 @@ QUnit.test("ajax: deselect D", function (assert) {
 });
 
 QUnit.test("ajax: select E", function (assert) {
-  let selectEFn = jQueryFrameFn("#page\\:mainForm\\:selectE input");
-  let outputEFn = jQueryFrameFn("#page\\:mainForm\\:outputE span");
+  var selectEFn = jQueryFrameFn("#page\\:mainForm\\:selectE input");
+  var outputEFn = jQueryFrameFn("#page\\:mainForm\\:outputE span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectEFn().prop("checked", true).trigger("change");
   });
@@ -103,10 +103,10 @@ QUnit.test("ajax: select E", function (assert) {
 });
 
 QUnit.test("ajax: deselect E", function (assert) {
-  let selectEFn = jQueryFrameFn("#page\\:mainForm\\:selectE input");
-  let outputEFn = jQueryFrameFn("#page\\:mainForm\\:outputE span");
+  var selectEFn = jQueryFrameFn("#page\\:mainForm\\:selectE input");
+  var outputEFn = jQueryFrameFn("#page\\:mainForm\\:outputE span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectEFn().prop("checked", false).trigger("change");
   });
@@ -118,10 +118,10 @@ QUnit.test("ajax: deselect E", function (assert) {
 });
 
 QUnit.test("ajax: select F", function (assert) {
-  let selectFFn = jQueryFrameFn("#page\\:mainForm\\:selectF input");
-  let outputFFn = jQueryFrameFn("#page\\:mainForm\\:outputF span");
+  var selectFFn = jQueryFrameFn("#page\\:mainForm\\:selectF input");
+  var outputFFn = jQueryFrameFn("#page\\:mainForm\\:outputF span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectFFn().prop("checked", true).trigger("change");
   });
@@ -133,10 +133,10 @@ QUnit.test("ajax: select F", function (assert) {
 });
 
 QUnit.test("ajax: deselect F", function (assert) {
-  let selectFFn = jQueryFrameFn("#page\\:mainForm\\:selectF input");
-  let outputFFn = jQueryFrameFn("#page\\:mainForm\\:outputF span");
+  var selectFFn = jQueryFrameFn("#page\\:mainForm\\:selectF input");
+  var outputFFn = jQueryFrameFn("#page\\:mainForm\\:outputF span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectFFn().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 a9b511d..b618c1d 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) {
-  let aliceFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
-  let bobFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
+  var aliceFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
+  var bobFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     aliceFn().prop("selected", true);
     bobFn().prop("selected", false);
@@ -36,12 +36,12 @@ QUnit.test("submit: Alice", function (assert) {
 });
 
 QUnit.test("submit: Bob", function (assert) {
-  let aliceFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
-  let bobFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
+  var aliceFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
+  var bobFn = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     aliceFn().prop("selected", false);
     bobFn().prop("selected", true);
@@ -55,11 +55,11 @@ QUnit.test("submit: Bob", function (assert) {
 });
 
 QUnit.test("ajax: select Mars", function (assert) {
-  let marsFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
-  let jupiterFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
-  let moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+  var marsFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
+  var jupiterFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
+  var moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     jupiterFn().prop("selected", false);
     marsFn().prop("selected", true).trigger("change");
@@ -73,11 +73,11 @@ QUnit.test("ajax: select Mars", function (assert) {
 });
 
 QUnit.test("ajax: select Jupiter", function (assert) {
-  let marsFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
-  let jupiterFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
-  let moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+  var marsFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
+  var jupiterFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
+  var moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     marsFn().prop("selected", false);
     jupiterFn().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 b09823a..3e6b0a4 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) {
-  let number1Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
-  let number2Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
-  let submitAddFn = jQueryFrameFn("#page\\:mainForm\\:submitAdd");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  var number1Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
+  var number2Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
+  var submitAddFn = jQueryFrameFn("#page\\:mainForm\\:submitAdd");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     number1Fn().eq(0).prop("checked", false);
     number1Fn().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) {
-  let number1Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
-  let number2Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
-  let submitSubFn = jQueryFrameFn("#page\\:mainForm\\:submitSub");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  var number1Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
+  var number2Fn = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
+  var submitSubFn = jQueryFrameFn("#page\\:mainForm\\:submitSub");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     number1Fn().eq(0).prop("checked", false);
     number1Fn().eq(1).prop("checked", false);
@@ -62,10 +62,10 @@ QUnit.test("submit: Subtraction (4 - 1)", function (assert) {
 });
 
 QUnit.test("ajax: select Mars", function (assert) {
-  let planetFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
-  let moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
+  var planetFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
+  var moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     planetFn().eq(0).prop("checked", false);
     planetFn().eq(2).prop("checked", false);
@@ -80,10 +80,10 @@ QUnit.test("ajax: select Mars", function (assert) {
 });
 
 QUnit.test("ajax: select Jupiter", function (assert) {
-  let planetFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
-  let moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
+  var planetFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
+  var moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     planetFn().eq(0).prop("checked", false);
     planetFn().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 2f641ca..5995046 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) {
-  let riversFn = jQueryFrameFn("#page\\:mainForm\\:riverList option");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
+  var riversFn = jQueryFrameFn("#page\\:mainForm\\:riverList option");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     riversFn().eq(0).prop("selected", true); // Nile
     riversFn().eq(1).prop("selected", false); // Amazon
@@ -37,11 +37,11 @@ QUnit.test("submit: select 'Nile'", function (assert) {
 });
 
 QUnit.test("submit: select 'Yangtze'", function (assert) {
-  let riversFn = jQueryFrameFn("#page\\:mainForm\\:riverList option");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
+  var riversFn = jQueryFrameFn("#page\\:mainForm\\:riverList option");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     riversFn().eq(0).prop("selected", false); // Nile
     riversFn().eq(1).prop("selected", false); // Amazon
@@ -59,10 +59,10 @@ QUnit.test("submit: select 'Yangtze'", function (assert) {
 });
 
 QUnit.test("ajax: select Everest", function (assert) {
-  let mountainsFn = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
+  var mountainsFn = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     mountainsFn().eq(1).prop("selected", false);
     mountainsFn().eq(2).prop("selected", false);
@@ -78,10 +78,10 @@ QUnit.test("ajax: select Everest", function (assert) {
 });
 
 QUnit.test("ajax: select Makalu", function (assert) {
-  let mountainsFn = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
+  var mountainsFn = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     mountainsFn().eq(0).prop("selected", false);
     mountainsFn().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 6dd3170..5fc075f 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) {
-  let animalsFn = jQueryFrameFn("#page\\:mainForm\\:animals input");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
+  var animalsFn = jQueryFrameFn("#page\\:mainForm\\:animals input");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     animalsFn().eq(0).prop("checked", true);
     animalsFn().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) {
-  let animalsFn = jQueryFrameFn("#page\\:mainForm\\:animals input");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
+  var animalsFn = jQueryFrameFn("#page\\:mainForm\\:animals input");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     animalsFn().eq(0).prop("checked", false);
     animalsFn().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) {
-  let number2Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
-  let newOutputValue;
+  var number2Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  var newOutputValue;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     if (number2Fn().prop("checked")) {
       newOutputValue = parseInt(outputFn().text()) - 2;
@@ -78,11 +78,11 @@ QUnit.test("ajax: click 'Two'", function (assert) {
 });
 
 QUnit.test("ajax: click 'Three'", function (assert) {
-  let number3Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:2");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
-  let newOutputValue;
+  var number3Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:2");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  var newOutputValue;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     if (number3Fn().prop("checked")) {
       newOutputValue = parseInt(outputFn().text()) - 3;
@@ -100,11 +100,11 @@ QUnit.test("ajax: click 'Three'", function (assert) {
 });
 
 QUnit.test("ajax: click 'Two'", function (assert) {
-  let number2Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
-  let newOutputValue;
+  var number2Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  var newOutputValue;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     if (number2Fn().prop("checked")) {
       newOutputValue = parseInt(outputFn().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 bc39311..ade2d9b 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) {
-  let $button = jQueryFrame("#page\\:mainForm\\:buttonWithLinks");
+  var $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 8f54dae..7d2718b 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) {
-  let boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox1");
-  let showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox1");
-  let hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox1");
-  let boxBodyFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox1 .card-body");
+  var boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox1");
+  var showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox1");
+  var hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox1");
+  var boxBodyFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox1 .card-body");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(3, function () {
     assert.equal(showBoxFn().length, 1);
     assert.equal(hideBoxFn().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) {
-  let boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox2");
-  let showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox2");
-  let hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox2");
-  let boxBodyFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox2 .card-body");
+  var boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox2");
+  var showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox2");
+  var hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox2");
+  var boxBodyFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox2 .card-body");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(3, function () {
     assert.equal(showBoxFn().length, 1);
     assert.equal(hideBoxFn().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) {
-  let boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox3");
-  let showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox3");
-  let hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox3");
+  var boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox3");
+  var showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox3");
+  var hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox3");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(3, function () {
     assert.ok(boxFn().hasClass("tobago-collapsed"));
     assert.equal(showBoxFn().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 61df3ad..48268ed 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);
 
-  let $sectionLevel5 = jQueryFrame("#page\\:mainForm\\:sectionLevel5");
-  let $header5 = $sectionLevel5.find("h5");
+  var $sectionLevel5 = jQueryFrame("#page\\:mainForm\\:sectionLevel5");
+  var $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 24a116d..da57278 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);
 
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  var cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
 
   assert.equal(popupFn().attr("value"), "true");
   openButtonFn().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) {
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
-  let messagesFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
-  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
-  let cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
-  let outputValue = outputFn().text();
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
+  var messagesFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+  var inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  var submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+  var cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  var outputValue = outputFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(1, function () {
     assert.equal(popupFn().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) {
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
-  let messagesFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
-  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
-  let cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
+  var messagesFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+  var inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  var submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+  var cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(1, function () {
     assert.equal(popupFn().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) {
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
-  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let submitCloseButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
-  let outputValue = outputFn().text();
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
+  var inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  var submitCloseButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+  var outputValue = outputFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(1, function () {
     assert.equal(popupFn().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) {
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
-  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let submitCloseButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
+  var inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+  var submitCloseButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(1, function () {
     assert.equal(popupFn().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) {
-  let dropdownContainerFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
-  let dropdownButtonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:largePopupLink");
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:largePopup");
-  let closeButtonFn = jQueryFrameFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
+  var dropdownContainerFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
+  var dropdownButtonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:largePopupLink");
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:largePopup");
+  var closeButtonFn = jQueryFrameFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     if (popupFn().hasClass("show")) {
       closeButtonFn().click();
@@ -210,13 +210,13 @@ QUnit.test("Open 'Large Popup'.", function (assert) {
 });
 
 QUnit.test("Open 'Small Popup'.", function (assert) {
-  let dropdownContainerFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
-  let dropdownButtonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
-  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:smallPopupLink");
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:smallPopup");
-  let closeButtonFn = jQueryFrameFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
+  var dropdownContainerFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
+  var dropdownButtonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+  var openButtonFn = jQueryFrameFn("#page\\:mainForm\\:smallPopupLink");
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:smallPopup");
+  var closeButtonFn = jQueryFrameFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     if (popupFn().hasClass("show")) {
       closeButtonFn().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 58aa328..15355cb 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) {
-  let hiddenInputFn = jQueryFrameFn("#page\\:mainForm\\:tabGroupClient\\:\\:activeIndex");
-  let tab1Fn = jQueryFrameFn("#page\\:mainForm\\:tab1Client");
-  let tab3Fn = jQueryFrameFn("#page\\:mainForm\\:tab3Client");
-  let tab3linkFn = jQueryFrameFn("#page\\:mainForm\\:tab3Client .nav-link");
+  var hiddenInputFn = jQueryFrameFn("#page\\:mainForm\\:tabGroupClient\\:\\:activeIndex");
+  var tab1Fn = jQueryFrameFn("#page\\:mainForm\\:tab1Client");
+  var tab3Fn = jQueryFrameFn("#page\\:mainForm\\:tab3Client");
+  var tab3linkFn = jQueryFrameFn("#page\\:mainForm\\:tab3Client .nav-link");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(5, function () {
     assert.equal(hiddenInputFn().val(), 0);
     assert.ok(tab1Fn().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) {
-  let hiddenInputFn = jQueryFrameFn("#page\\:mainForm\\:tabGroupAjax\\:\\:activeIndex");
-  let tab1Fn = jQueryFrameFn("#page\\:mainForm\\:tab1Ajax");
-  let tab3Fn = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax");
-  let tab3linkFn = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax .nav-link");
+  var hiddenInputFn = jQueryFrameFn("#page\\:mainForm\\:tabGroupAjax\\:\\:activeIndex");
+  var tab1Fn = jQueryFrameFn("#page\\:mainForm\\:tab1Ajax");
+  var tab3Fn = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax");
+  var tab3linkFn = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax .nav-link");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(5, function () {
     assert.equal(hiddenInputFn().val(), 0);
     assert.ok(tab1Fn().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) {
-  let hiddenInputFn = jQueryFrameFn("#page\\:mainForm\\:tabGroupFullReload\\:\\:activeIndex");
-  let tab1Fn = jQueryFrameFn("#page\\:mainForm\\:tab1FullReload");
-  let tab3Fn = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload");
-  let tab3linkFn = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload .nav-link");
+  var hiddenInputFn = jQueryFrameFn("#page\\:mainForm\\:tabGroupFullReload\\:\\:activeIndex");
+  var tab1Fn = jQueryFrameFn("#page\\:mainForm\\:tab1FullReload");
+  var tab3Fn = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload");
+  var tab3linkFn = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload .nav-link");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(5, function () {
     assert.equal(hiddenInputFn().val(), 0);
     assert.ok(tab1Fn().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 5fa05cd..9bcf7cd 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) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
@@ -69,11 +69,11 @@ QUnit.test("Basics: Name", function (assert) {
 });
 
 QUnit.test("Basics: Period", function (assert) {
-  let colPeriodFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  var colPeriodFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colPeriodFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colPeriodFn().click();
@@ -122,11 +122,11 @@ QUnit.test("Basics: Period", function (assert) {
 });
 
 QUnit.test("Basics: Year", function (assert) {
-  let colYearFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  var colYearFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colYearFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colYearFn().click();
@@ -176,11 +176,11 @@ QUnit.test("Basics: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Basics: left paging", function (assert) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
@@ -223,12 +223,12 @@ QUnit.test("Basics: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Basics: center paging", function (assert) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  let centerPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  var centerPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
@@ -295,13 +295,13 @@ QUnit.test("Basics: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Basics: right paging", function (assert) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  let rightPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
-  let jumpToPageFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  var rightPagingFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
+  var jumpToPageFn = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
@@ -383,11 +383,11 @@ QUnit.test("Basics: right paging", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Name", function (assert) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
@@ -436,11 +436,11 @@ QUnit.test("Custom Sorting: Name", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Period", function (assert) {
-  let colPeriodFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  var colPeriodFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colPeriodFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colPeriodFn().click();
@@ -489,11 +489,11 @@ QUnit.test("Custom Sorting: Period", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Year", function (assert) {
-  let colYearFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  var colYearFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colYearFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colYearFn().click();
@@ -543,11 +543,11 @@ QUnit.test("Custom Sorting: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Custom Sorting: left paging", function (assert) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().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) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  let centerPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  var centerPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().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) {
-  let colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  let rightPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
+  var colNameFn = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
+  var rowsFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
+  var leftPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  var rightPagingFn = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
       colNameFn().click();
@@ -750,18 +750,18 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
 
 function ajaxExecuteBodyTableCheck(assert, rowsFn, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
                                    row2col0, row2col1, row2col2, row3col0, row3col1, row3col2) {
-  let $row0Col0 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row0Col1 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row0Col2 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim();
-  let $row1Col0 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row1Col1 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row1Col2 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim();
-  let $row2Col0 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row2Col1 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row2Col2 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim();
-  let $row3Col0 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row3Col1 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row3Col2 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim();
+  var $row0Col0 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(0).text().trim();
+  var $row0Col1 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(1).text().trim();
+  var $row0Col2 = rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim();
+  var $row1Col0 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(0).text().trim();
+  var $row1Col1 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(1).text().trim();
+  var $row1Col2 = rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim();
+  var $row2Col0 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(0).text().trim();
+  var $row2Col1 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(1).text().trim();
+  var $row2Col2 = rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim();
+  var $row3Col0 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(0).text().trim();
+  var $row3Col1 = rowsFn().eq(3).find(".tobago-sheet-cell").eq(1).text().trim();
+  var $row3Col2 = rowsFn().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 92036a0..62f9d42 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) {
-  let oneClickAjaxFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:0");
-  let venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample0");
-  let jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample0");
-  let saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample0");
-  let namefieldFn = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  var oneClickAjaxFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:0");
+  var venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample0");
+  var jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample0");
+  var saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample0");
+  var namefieldFn = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     oneClickAjaxFn().click();
   });
@@ -57,13 +57,13 @@ QUnit.test("On click with ajax", function (assert) {
 });
 
 QUnit.test("On click with full request", function (assert) {
-  let oneClickFullRequestFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:1");
-  let venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample1");
-  let jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample1");
-  let saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample1");
-  let namefieldFn = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  var oneClickFullRequestFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:1");
+  var venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample1");
+  var jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample1");
+  var saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample1");
+  var namefieldFn = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     oneClickFullRequestFn().click();
   });
@@ -98,13 +98,13 @@ QUnit.test("On click with full request", function (assert) {
 });
 
 QUnit.test("On double click with full request", function (assert) {
-  let doubleClickFullRequestFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:2");
-  let venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample2");
-  let jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample2");
-  let saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample2");
-  let namefieldFn = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  var doubleClickFullRequestFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:2");
+  var venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample2");
+  var jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample2");
+  var saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample2");
+  var namefieldFn = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     doubleClickFullRequestFn().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) {
-  let radioButtonFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:3");
-  let venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample3");
-  let jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample3");
-  let saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample3");
-  let popupFn = jQueryFrameFn("#page\\:mainForm\\:popup");
-  let nameFn = jQueryFrameFn("#page\\:mainForm\\:popup\\:popupName\\:\\:field");
-  let cancelFn = jQueryFrameFn("#page\\:mainForm\\:popup\\:cancel");
+  var radioButtonFn = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:3");
+  var venusFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample3");
+  var jupiterFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample3");
+  var saturnFn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample3");
+  var popupFn = jQueryFrameFn("#page\\:mainForm\\:popup");
+  var nameFn = jQueryFrameFn("#page\\:mainForm\\:popup\\:popupName\\:\\:field");
+  var cancelFn = jQueryFrameFn("#page\\:mainForm\\:popup\\:cancel");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     radioButtonFn().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 b4b2a2a..630cd9f 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) {
-  let musicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  let mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let selectableSingleFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:1");
-  let inputFn = jQueryFrameFn(".tobago-treeSelect input");
+  var musicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+  var mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  var selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  var selectableSingleFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:1");
+  var inputFn = jQueryFrameFn(".tobago-treeSelect input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectableNoneFn().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) {
-  let classicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  let mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let selectableSingleLeafOnlyFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:2");
-  let inputFn = jQueryFrameFn(".tobago-treeSelect input");
+  var classicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+  var mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  var selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  var selectableSingleLeafOnlyFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:2");
+  var inputFn = jQueryFrameFn(".tobago-treeSelect input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectableNoneFn().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) {
-  let musicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  let mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let selectableMultiFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:3");
-  let inputFn = jQueryFrameFn(".tobago-treeSelect input");
+  var musicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+  var mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  var selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  var selectableMultiFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:3");
+  var inputFn = jQueryFrameFn(".tobago-treeSelect input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectableNoneFn().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) {
-  let classicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  let mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let selectableMultiLeafOnlyFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:4");
-  let inputFn = jQueryFrameFn(".tobago-treeSelect input");
+  var classicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+  var mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  var selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  var selectableMultiLeafOnlyFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:4");
+  var inputFn = jQueryFrameFn(".tobago-treeSelect input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectableNoneFn().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) {
-  let musicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  let classicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  let mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let selectableMultiCascadeFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:5");
-  let inputFn = jQueryFrameFn(".tobago-treeSelect input");
+  var musicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+  var classicFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+  var mathematicsFn = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
+  var selectableNoneFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
+  var selectableMultiCascadeFn = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:5");
+  var inputFn = jQueryFrameFn(".tobago-treeSelect input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     selectableNoneFn().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 f023ea9..0938ae4 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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let textareaFn = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
-  let textareaValue = textareaFn().val();
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var textareaFn = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
+  var textareaValue = textareaFn().val();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     textareaFn().val("");
     submitFn().click();
@@ -35,11 +35,11 @@ QUnit.test("Required: Submit without content.", function (assert) {
 });
 
 QUnit.test("Required: Submit with content.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let textareaFn = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var textareaFn = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     textareaFn().val("some content");
     submitFn().click();
@@ -53,11 +53,11 @@ QUnit.test("Required: Submit with content.", function (assert) {
 });
 
 QUnit.test("Validate Length: Submit single character.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("a");
     submitFn().click();
@@ -70,11 +70,11 @@ QUnit.test("Validate Length: Submit single character.", function (assert) {
 });
 
 QUnit.test("Validate Length: Submit two character.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("ab");
     submitFn().click();
@@ -87,11 +87,11 @@ QUnit.test("Validate Length: Submit two character.", function (assert) {
 });
 
 QUnit.test("Validate Range: Submit no number.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("no number");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("2");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("78");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("64");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("T");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("3");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("T3");
     submitFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("java");
     submitFn().click();
@@ -223,11 +223,11 @@ QUnit.test("Custom Validator: Submit rejected string.", function (assert) {
 });
 
 QUnit.test("Custom Validator: Submit accepted string.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("tobago");
     submitFn().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 90d3c81..1b7cedc 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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("");
     submitFn().click();
@@ -33,11 +33,11 @@ QUnit.test("Required: Submit without content.", function (assert) {
 });
 
 QUnit.test("Required: Submit with content.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("some content");
     submitFn().click();
@@ -50,11 +50,11 @@ QUnit.test("Required: Submit with content.", function (assert) {
 });
 
 QUnit.test("Length: Submit single character.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("a");
     submitFn().click();
@@ -67,11 +67,11 @@ QUnit.test("Length: Submit single character.", function (assert) {
 });
 
 QUnit.test("Length: Submit three characters.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("abc");
     submitFn().click();
@@ -84,11 +84,11 @@ QUnit.test("Length: Submit three characters.", function (assert) {
 });
 
 QUnit.test("Length: Submit five characters.", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val("abcde");
     submitFn().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 0a8581d..535a71a 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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
-  let form1SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:submit1");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
+  var form1SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:submit1");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Alice");
     form1SubmitButtonFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let form2SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  var form2SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let form2SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  var form2SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().val("");
     outerFormInputFieldFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().val("");
     outerFormInputFieldFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().val("Dave");
     outerFormInputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
-
-  let TTT = new TobagoTestTools(assert);
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormSubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Eve");
     form2InputFieldFn().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 ddda072..4db756a 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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:submit1");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:submit1");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Alice");
     buttonFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form2OutputFieldValue = form2OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().val("");
     buttonFn().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) {
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form2InputFieldFn().val("Bob");
     buttonFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form1OutputFieldValue = form1OutputFieldFn().text();
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form1OutputFieldValue = form1OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Charlie");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form1OutputFieldValue = form1OutputFieldFn().text();
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form1OutputFieldValue = form1OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Dave");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form1OutputFieldValue = form1OutputFieldFn().text();
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form1OutputFieldValue = form1OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Frank");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Hank");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form1OutputFieldValue = form1OutputFieldFn().text();
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form1OutputFieldValue = form1OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Kate");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Mike");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form1OutputFieldValue = form1OutputFieldFn().text();
-  let form2OutputFieldValue = form2OutputFieldFn().text();
-  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
+  var form1OutputFieldValue = form1OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
+  var outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Oscar");
     form2InputFieldFn().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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
-  let alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
+  var outerFormInputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
+  var outerFormOutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
+  var alertFn = jQueryFrameFn("#page\\:messages .alert-danger label");
 
-  let form1OutputFieldValue = form1OutputFieldFn().text();
-  let form2OutputFieldValue = form2OutputFieldFn().text();
+  var form1OutputFieldValue = form1OutputFieldFn().text();
+  var form2OutputFieldValue = form2OutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Quin");
     form2InputFieldFn().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 9a0e017..fe97193 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) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
-  let form1SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:submit1");
-  let $form2OutputFieldValue = form2OutputFieldFn().text();
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
+  var form1SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:submit1");
+  var $form2OutputFieldValue = form2OutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Oliver");
     form2InputFieldFn().val("Peter");
@@ -40,14 +40,14 @@ QUnit.test("submit form 1", function (assert) {
 });
 
 QUnit.test("submit form 2", function (assert) {
-  let form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
-  let form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
-  let form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
-  let form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
-  let form2SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:submit2");
-  let $form1OutputFieldValue = form1OutputFieldFn().text();
+  var form1InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
+  var form2InputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
+  var form1OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
+  var form2OutputFieldFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
+  var form2SubmitButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:submit2");
+  var $form1OutputFieldValue = form1OutputFieldFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     form1InputFieldFn().val("Oliver");
     form2InputFieldFn().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 8309871..e92e87e 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) {
-  let nameFn = jQueryFrameFn("#page\\:mainForm\\:add\\:inName\\:\\:field");
-  let lengthFn = jQueryFrameFn("#page\\:mainForm\\:add\\:inLength\\:\\:field");
-  let dischargeFn = jQueryFrameFn("#page\\:mainForm\\:add\\:inDischarge\\:\\:field");
-  let addFn = jQueryFrameFn("#page\\:mainForm\\:add\\:buttonAdd");
-  let resetFn = jQueryFrameFn("#page\\:mainForm\\:reset\\:buttonReset");
-  let forEachBoxesFn = jQueryFrameFn("#page\\:mainForm\\:forEach .tobago-box");
-  let uiRepeatSectionsFn = jQueryFrameFn("#page\\:mainForm\\:uiRepeat .tobago-section");
+  var nameFn = jQueryFrameFn("#page\\:mainForm\\:add\\:inName\\:\\:field");
+  var lengthFn = jQueryFrameFn("#page\\:mainForm\\:add\\:inLength\\:\\:field");
+  var dischargeFn = jQueryFrameFn("#page\\:mainForm\\:add\\:inDischarge\\:\\:field");
+  var addFn = jQueryFrameFn("#page\\:mainForm\\:add\\:buttonAdd");
+  var resetFn = jQueryFrameFn("#page\\:mainForm\\:reset\\:buttonReset");
+  var forEachBoxesFn = jQueryFrameFn("#page\\:mainForm\\:forEach .tobago-box");
+  var uiRepeatSectionsFn = jQueryFrameFn("#page\\:mainForm\\:uiRepeat .tobago-section");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     resetFn().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 5407106..ba27f3f 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) {
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
-  let contentFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
+  var contentFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().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) {
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
-  let contentFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
+  var contentFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().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) {
-  let show1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
-  let show2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
-  let content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = content2Fn().length;
+  var show1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
+  var show2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
+  var content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  var content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  var content2Length = content2Fn().length;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     show1Fn().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) {
-  let show1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
-  let hide2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
-  let content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = content2Fn().length;
+  var show1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
+  var hide2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
+  var content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  var content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  var content2Length = content2Fn().length;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     show1Fn().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) {
-  let hide1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
-  let show2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
-  let content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = content2Fn().length;
+  var hide1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
+  var show2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
+  var content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  var content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  var content2Length = content2Fn().length;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hide1Fn().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) {
-  let hide1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
-  let hide2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
-  let content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = content2Fn().length;
+  var hide1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
+  var hide2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
+  var content1Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
+  var content2Fn = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
+  var content2Length = content2Fn().length;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hide1Fn().click();
   });
@@ -170,11 +170,11 @@ QUnit.test("Full Server Request: close both boxes", function (assert) {
 });
 
 QUnit.test("Client Side: show -> hide transition", function (assert) {
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  let boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  var boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -191,11 +191,11 @@ QUnit.test("Client Side: show -> hide transition", function (assert) {
 });
 
 QUnit.test("Client Side: hide -> show transition", function (assert) {
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  let boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  var boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  let boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:inNoRequestBox\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:client\\:submitNoRequestBox");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  var boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:inNoRequestBox\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:client\\:submitNoRequestBox");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().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) {
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -261,11 +261,11 @@ QUnit.test("Ajax: show -> hide transition", function (assert) {
 });
 
 QUnit.test("Ajax: hide -> show transition", function (assert) {
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().click();
   });
@@ -284,13 +284,13 @@ QUnit.test("Ajax: hide -> show transition", function (assert) {
 });
 
 QUnit.test("Ajax: hide content and submit empty string", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages .tobago-messages");
-  let showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
-  let submitFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:submitAjaxBox");
+  var messagesFn = jQueryFrameFn("#page\\:messages .tobago-messages");
+  var showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  var submitFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:submitAjaxBox");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().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 4e7ba69..febc113 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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let openFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:open1");
-  let submitOnPageFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:submitOnPage1");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:in1\\:\\:field");
-  let submitOnPopupFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:submitOnPopup1");
-  let closeFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:close1");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var openFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:open1");
+  var submitOnPageFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:submitOnPage1");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:in1\\:\\:field");
+  var submitOnPopupFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:submitOnPopup1");
+  var closeFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:close1");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     openFn().click();
   });
@@ -69,14 +69,14 @@ QUnit.test("Simple Popup", function (assert) {
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let openFn = jQueryFrameFn("#page\\:mainForm\\:server\\:open2");
-  let submitOnPageFn = jQueryFrameFn("#page\\:mainForm\\:server\\:submitOnPage2");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:in2\\:\\:field");
-  let submitOnPopupFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:submitOnPopup2");
-  let closeFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:close2");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var openFn = jQueryFrameFn("#page\\:mainForm\\:server\\:open2");
+  var submitOnPageFn = jQueryFrameFn("#page\\:mainForm\\:server\\:submitOnPage2");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:in2\\:\\:field");
+  var submitOnPopupFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:submitOnPopup2");
+  var closeFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:close2");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     openFn().click();
   });
@@ -122,15 +122,15 @@ QUnit.test("Full Server Request", function (assert) {
 });
 
 QUnit.test("Client Side", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let openFn = jQueryFrameFn("#page\\:mainForm\\:client\\:open3");
-  let submitOnPageFn = jQueryFrameFn("#page\\:mainForm\\:client\\:submitOnPage3");
-  let popupCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:in3\\:\\:field");
-  let submitOnPopupFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:submitOnPopup3");
-  let closeFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:close3");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var openFn = jQueryFrameFn("#page\\:mainForm\\:client\\:open3");
+  var submitOnPageFn = jQueryFrameFn("#page\\:mainForm\\:client\\:submitOnPage3");
+  var popupCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:in3\\:\\:field");
+  var submitOnPopupFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:submitOnPopup3");
+  var closeFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:close3");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     openFn().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 c9cd0aa..314a200 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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
-  let panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:simplePanel\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
+  var panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:simplePanel\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -74,14 +74,14 @@ QUnit.test("Simple Panel", function (assert) {
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
-  let panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:server\\:serverPanel\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
+  var panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:server\\:serverPanel\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -132,14 +132,14 @@ QUnit.test("Full Server Request", function (assert) {
 });
 
 QUnit.test("Client Side", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
-  let panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPanel\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
+  var panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPanel\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -188,14 +188,14 @@ QUnit.test("Client Side", function (assert) {
 });
 
 QUnit.test("Ajax", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
-  let panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxPanel\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
+  var panelCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxPanel\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().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 fd27fbf..29cedaa 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) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
-  let sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:simpleSection\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
+  var sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:simpleSection\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -74,14 +74,14 @@ QUnit.test("Simple Panel", function (assert) {
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
-  let sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullRequestSection\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
+  var sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:server\\:fullRequestSection\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -132,14 +132,14 @@ QUnit.test("Full Server Request", function (assert) {
 });
 
 QUnit.test("Client Side", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
-  let sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientSection\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
+  var sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:client\\:clientSection\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().click();
   });
@@ -188,14 +188,14 @@ QUnit.test("Client Side", function (assert) {
 });
 
 QUnit.test("Ajax", function (assert) {
-  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let submitFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
-  let showFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
-  let hideFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
-  let sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxSection\\:\\:collapse");
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
+  var messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  var submitFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
+  var showFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
+  var hideFn = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
+  var sectionCollapsedFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxSection\\:\\:collapse");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     showFn().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 f4b04d7..65ade57 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) {
-  let inputString = "Ma";
-  let expectedLength = 4;
+  var inputString = "Ma";
+  var expectedLength = 4;
 
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:deprecated\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:deprecated");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:deprecated\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:deprecated");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().val(inputString).trigger('input');
   });
@@ -37,13 +37,13 @@ QUnit.test("Deprecated: 'Ma'", function (assert) {
 });
 
 QUnit.test("Replacement: 'Ma'", function (assert) {
-  let inputString = "Ma";
-  let expectedLength = 4;
+  var inputString = "Ma";
+  var expectedLength = 4;
 
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:replacement\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:replacement");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:replacement\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:replacement");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().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 3396ce7..41b3d27 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) {
-  let inputString = "M";
-  let expectedLength = 3;
+  var inputString = "M";
+  var expectedLength = 3;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Ma'", function (assert) {
-  let inputString = "Ma";
-  let expectedLength = 2;
+  var inputString = "Ma";
+  var expectedLength = 2;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mar'", function (assert) {
-  let inputString = "Mar";
-  let expectedLength = 2;
+  var inputString = "Mar";
+  var expectedLength = 2;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 QUnit.test("Basics: 'Mars'", function (assert) {
-  let inputString = "Mars";
-  let expectedLength = 1;
+  var inputString = "Mars";
+  var expectedLength = 1;
 
   testMarsBasics(assert, inputString, expectedLength);
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  let inFn = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
-  let suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
+  var inFn = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
+  var suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     inFn().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 06ad80a..c9b47b6 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) {
-  let $dateField = jQueryFrame("#page\\:mainForm\\:dateNoPattern\\:\\:field");
-  let $dateButton = jQueryFrame("#page\\:mainForm\\:dateNoPattern button");
+  var $dateField = jQueryFrame("#page\\:mainForm\\:dateNoPattern\\:\\:field");
+  var $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 ee28cfc..4e914d9 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 () {
 
-  let date;
-  let format = "dd.mm.yy";
-  let initial = "13.05.2014";
-  let result;
+  var date;
+  var format = "dd.mm.yy";
+  var initial = "13.05.2014";
+  var result;
 
   date = moment(initial, format);
   result = moment(date).format(format);
@@ -48,10 +48,10 @@ TestDateTime.testDate = function () {
 
 TestDateTime.testTime = function () {
 
-  let date;
-  let format = "HH:mm:ss";
-  let initial = "14:06:55";
-  let result;
+  var date;
+  var format = "HH:mm:ss";
+  var initial = "14:06:55";
+  var result;
 
   date = moment(initial, format);
   result = moment(date).format(format);
@@ -66,12 +66,12 @@ TestDateTime.testTime = function () {
 
 TestDateTime.testBoth = function () {
 
-  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 = " ";
+  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 = " ";
 
   date = moment(initial, formatD + ' ' +  formatT);
   dateT = {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/date-tobagoConverter.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/date-tobagoConverter.test.js
index 11d6020..71e06f1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/date-tobagoConverter.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/date-tobagoConverter.test.js
@@ -16,9 +16,9 @@
  */
 
 QUnit.test("Date - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesDateInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesDateInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesDateOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesDateInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesDateInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesDateOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -27,9 +27,9 @@ QUnit.test("Date - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("Date - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -38,9 +38,9 @@ QUnit.test("Date - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("Calendar - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -49,9 +49,9 @@ QUnit.test("Calendar - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("LocalDate - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateOutput .tobago-out");
 
   if (inputFn().length > 0) {
     testConvertDateTime(assert,
@@ -64,9 +64,9 @@ QUnit.test("LocalDate - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("LocalDate - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -75,9 +75,9 @@ QUnit.test("LocalDate - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("LocalTime - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalTimeOutput .tobago-out");
 
   if (inputFn().length > 0) {
     testConvertDateTime(assert,
@@ -90,9 +90,9 @@ QUnit.test("LocalTime - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("LocalTime - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalTimeOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -101,9 +101,9 @@ QUnit.test("LocalTime - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("LocalDateTime - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesLocalDateTimeOutput .tobago-out");
 
   if (inputFn().length > 0) {
     testConvertDateTime(assert,
@@ -116,9 +116,9 @@ QUnit.test("LocalDateTime - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("LocalDateTime - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoLocalDateTimeOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -127,9 +127,9 @@ QUnit.test("LocalDateTime - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("OffsetTime - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetTimeOutput .tobago-out");
 
   if (inputFn().length > 0) {
     testConvertDateTime(assert,
@@ -142,9 +142,9 @@ QUnit.test("OffsetTime - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("OffsetTime - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetTimeOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -153,9 +153,9 @@ QUnit.test("OffsetTime - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("OffsetDateTime - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetDateTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesOffsetDateTimeOutput .tobago-out");
 
   if (inputFn().length > 0) {
     testConvertDateTime(assert,
@@ -168,9 +168,9 @@ QUnit.test("OffsetDateTime - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("OffsetDateTime - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetDateTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoOffsetDateTimeOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -179,9 +179,9 @@ QUnit.test("OffsetDateTime - tc:convertDateTime", function (assert) {
 });
 
 QUnit.test("ZonedDateTime - f:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesZonedDateTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesZonedDateTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesZonedDateTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesZonedDateTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:myfacesZonedDateTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:myfacesZonedDateTimeOutput .tobago-out");
 
   if (inputFn().length > 0) {
     testConvertDateTime(assert,
@@ -194,9 +194,9 @@ QUnit.test("ZonedDateTime - f:convertDateTime", function (assert) {
 });
 
 QUnit.test("ZonedDateTime - tc:convertDateTime", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoZonedDateTimeInput\\:\\:field");
-  let datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoZonedDateTimeInput .datepickerbutton");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoZonedDateTimeOutput .tobago-out");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoZonedDateTimeInput\\:\\:field");
+  var datepickerButtonFn = jQueryFrameFn("#page\\:mainForm\\:tobagoZonedDateTimeInput .datepickerbutton");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:tobagoZonedDateTimeOutput .tobago-out");
 
   testConvertDateTime(assert,
       inputFn, datepickerButtonFn, outputFn,
@@ -207,9 +207,9 @@ QUnit.test("ZonedDateTime - tc:convertDateTime", function (assert) {
 function testConvertDateTime(assert, inputFn, datepickerButtonFn, outputFn,
                              expectPattern, expectCalendarIcon, expectClockIcon,
                              inputValue, expectOutputValue) {
-  let submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:submitButton");
+  var submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:submitButton");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(3, function () {
     assert.equal(inputFn().data("tobago-pattern"), expectPattern);
     assert.equal(datepickerButtonFn().find(".fa-calendar").length, expectCalendarIcon);
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 4618db5..4f36139 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) {
-  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");
+  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");
 
   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 62ba05d..ff060e1 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) {
-  let dropdownMenuButtonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
-  let ajaxEntryFn = jQueryFrameFn("#page\\:mainForm\\:ajaxEntry");
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
-  let outputFn = jQueryFrameFn("#page\\:mainForm\\:outputAjax .tobago-out");
+  var dropdownMenuButtonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
+  var ajaxEntryFn = jQueryFrameFn("#page\\:mainForm\\:ajaxEntry");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+  var outputFn = jQueryFrameFn("#page\\:mainForm\\:outputAjax .tobago-out");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(1, function () {
     assert.equal(ajaxEntryFn().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 9e1900a..028468d 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) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardButtonAction");
-  let destinationSectionFn = jQueryFrameFn("#page\\:actionSection");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:standardButtonAction");
+  var destinationSectionFn = jQueryFrameFn("#page\\:actionSection");
   testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 QUnit.test("Standard Link Button", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardButtonLink");
-  let destinationSectionFn = jQueryFrameFn("#page\\:linkSection");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:standardButtonLink");
+  var destinationSectionFn = jQueryFrameFn("#page\\:linkSection");
   testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 QUnit.test("Standard Action Link", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardLinkAction");
-  let destinationSectionFn = jQueryFrameFn("#page\\:actionSection");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:standardLinkAction");
+  var destinationSectionFn = jQueryFrameFn("#page\\:actionSection");
   testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 QUnit.test("Standard Link Link", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardLinkLink");
-  let destinationSectionFn = jQueryFrameFn("#page\\:linkSection");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:standardLinkLink");
+  var destinationSectionFn = jQueryFrameFn("#page\\:linkSection");
   testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 function testStandardCommands(commandFn, destinationSectionFn, assert) {
-  let backFn = jQueryFrameFn("#page\\:back");
+  var backFn = jQueryFrameFn("#page\\:back");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     commandFn()[0].click();
   });
@@ -61,31 +61,31 @@ function testStandardCommands(commandFn, destinationSectionFn, assert) {
 }
 
 QUnit.test("Target Action Button", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetButtonAction");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:targetButtonAction");
   testTargetCommands(commandFn, "#textInput", "accessed by action", assert);
 });
 
 QUnit.test("Target Link Button", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetButtonLink");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:targetButtonLink");
   testTargetCommands(commandFn, "#textInput", "accessed by link", assert);
 });
 
 QUnit.test("Target Action Link", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetLinkAction");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:targetLinkAction");
   testTargetCommands(commandFn, "#textInput", "accessed by action", assert);
 });
 
 QUnit.test("Target Link Link", function (assert) {
-  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetLinkLink");
+  var commandFn = jQueryFrameFn("#page\\:mainForm\\:targetLinkLink");
   testTargetCommands(commandFn, "#textInput", "accessed by link", assert);
 });
 
 QUnit.test("Style must not be a dropdown item", function (assert) {
   assert.expect(3);
 
-  let dropdownMenuFn = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
-  let styleAsItemFn = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
+  var dropdownMenuFn = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
+  var styleAsItemFn = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
 
   assert.equal(dropdownMenuFn().length, 1);
   assert.equal(styleAsItemFn().length, 0);
@@ -93,13 +93,13 @@ QUnit.test("Style must not be a dropdown item", function (assert) {
 });
 
 function testTargetCommands(commandFn, targetTextInputSelector, expectedText, assert) {
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     commandFn()[0].click();
   });
   TTT.waitMs(2000); //TobagoTestTools.waitForResponse() didn't recognize responses on a target frame, so we just wait
   TTT.asserts(1, function () {
-    let $targetTextInput = jQueryTargetFrame(targetTextInputSelector);
+    var $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 4c2f786..1f68601 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) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link1");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink1");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link1");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink1");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h2", function (assert) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link2");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink2");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link2");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink2");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h3", function (assert) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link3");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink3");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link3");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink3");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h4", function (assert) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link4");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink4");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link4");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink4");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h5", function (assert) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link5");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink5");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link5");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink5");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h6", function (assert) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link6");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink6");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link6");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink6");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test no heading", function (assert) {
-  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link0");
-  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink0");
+  var alinkFn = jQueryFrameFn("#page\\:mainForm\\:link0");
+  var buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink0");
   testFont(assert, alinkFn, buttonlinkFn);
 });
 
@@ -68,12 +68,12 @@ function testFont(assert, alinkFn, buttonlinkFn) {
 }
 
 QUnit.test("Ajax reload for section 2", function (assert) {
-  let reloadButtonFn = jQueryFrameFn("#page\\:mainForm\\:reloadSection2");
-  let section2HeaderFn = jQueryFrameFn("#page\\:mainForm\\:levelTwoSection h3");
-  let timestampFn = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
-  let firstTimestamp = timestampFn().text();
+  var reloadButtonFn = jQueryFrameFn("#page\\:mainForm\\:reloadSection2");
+  var section2HeaderFn = jQueryFrameFn("#page\\:mainForm\\:levelTwoSection h3");
+  var timestampFn = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
+  var firstTimestamp = timestampFn().text();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.asserts(1, function () {
     assert.equal(section2HeaderFn().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 a35639d..55fd4f2 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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionNoLabel");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionNoLabel");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionNone");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionNone");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionSkip");
-  let $rootInput = $section.find(".tobago-section-content > input");
-  let $label = $section.find("label");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionSkip");
+  var $rootInput = $section.find(".tobago-section-content > input");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionTop");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionTop");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlowLeft");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlowLeft");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlowRight");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlowRight");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlexLeft");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlexLeft");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  let $section = jQueryFrame("#page\\:mainForm\\:sectionFlexRight");
-  let $rootDiv = $section.find(".tobago-section-content > div");
-  let $label = $rootDiv.find("label");
-  let $input = $rootDiv.find("input");
+  var $section = jQueryFrame("#page\\:mainForm\\:sectionFlexRight");
+  var $rootDiv = $section.find(".tobago-section-content > div");
+  var $label = $rootDiv.find("label");
+  var $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);
 
-  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");
+  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");
 
   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);
 
-  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");
+  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");
 
   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);
 
-  let $dataTobagoMarkups = jQueryFrame("#page\\:content .tobago-section-content [data-tobago-markup]");
+  var $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 3ea96a7..4d507fa 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) {
-  let $compLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + " label");
-  let $compTopLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + "Top label");
+  var $compLabel = jQueryFrame("#page\\:mainForm\\:" + idPart + " label");
+  var $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 78e6cc4..0513280 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) {
-  let $out = jQueryFrame("#page\\:mainForm\\:" + idSuffix);
+  var $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 3d406bd..2a65a67 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) {
-  let in1Fn = jQueryFrameFn("#page\\:mainForm\\:in1\\:\\:field");
-  let in2Fn = jQueryFrameFn("#page\\:mainForm\\:in2\\:\\:field");
-  let in3Fn = jQueryFrameFn("#page\\:mainForm\\:in3\\:\\:field");
-  let in4Fn = jQueryFrameFn("#page\\:mainForm\\:in4\\:\\:field");
-  let clearButtonFn = jQueryFrameFn("#page\\:mainForm\\:clear");
-  let submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let reloadButtonFn = jQueryFrameFn("#page\\:mainForm\\:reload");
+  var in1Fn = jQueryFrameFn("#page\\:mainForm\\:in1\\:\\:field");
+  var in2Fn = jQueryFrameFn("#page\\:mainForm\\:in2\\:\\:field");
+  var in3Fn = jQueryFrameFn("#page\\:mainForm\\:in3\\:\\:field");
+  var in4Fn = jQueryFrameFn("#page\\:mainForm\\:in4\\:\\:field");
+  var clearButtonFn = jQueryFrameFn("#page\\:mainForm\\:clear");
+  var submitButtonFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  var reloadButtonFn = jQueryFrameFn("#page\\:mainForm\\:reload");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     in1Fn().val("a");
     in2Fn().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 866752a..6b27576 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) {
-  let timestampFn = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
-  let textFn = jQueryFrameFn("#page\\:mainForm\\:outText span");
-  let tipFn = jQueryFrameFn("#page\\:mainForm\\:outTip span");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:ajaxButton");
+  var timestampFn = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
+  var textFn = jQueryFrameFn("#page\\:mainForm\\:outText span");
+  var tipFn = jQueryFrameFn("#page\\:mainForm\\:outTip span");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:ajaxButton");
 
-  let timestampValue = timestampFn().text();
-  let textValue = textFn().text();
-  let tipValue = tipFn().attr('title');
+  var timestampValue = timestampFn().text();
+  var textValue = textFn().text();
+  var tipValue = tipFn().attr('title');
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     buttonFn().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 fe98b71..d0f806e 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) {
-  let eventNames = ["click", "dblclick", "focus", "blur"];
-  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:buttonevent");
-  let ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:buttonajax");
+  var eventNames = ["click", "dblclick", "focus", "blur"];
+  var eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:buttonevent");
+  var ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:buttonajax");
   testEvent(assert, "button", eventNames, eventComponentFn, ajaxComponentFn, null);
 });
 
 QUnit.test("tc:in", function (assert) {
-  let eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:inevent\\:\\:field");
-  let ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:inajax\\:\\:field");
-  let changeValue = function (componentFn) {
-    let oldValue = componentFn().val();
-    let newValue = "hello";
+  var eventNames = ["change", "click", "dblclick", "focus", "blur"];
+  var eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:inevent\\:\\:field");
+  var ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:inajax\\:\\:field");
+  var changeValue = function (componentFn) {
+    var oldValue = componentFn().val();
+    var newValue = "hello";
     if (oldValue === "hello") {
       newValue = "hello there!"
     }
@@ -38,18 +38,18 @@ QUnit.test("tc:in", function (assert) {
 });
 
 QUnit.test("tc:row", function (assert) {
-  let eventNames = ["click", "dblclick"];
-  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
-  let ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
+  var eventNames = ["click", "dblclick"];
+  var eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
+  var ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
   testEvent(assert, "row", eventNames, eventComponentFn, ajaxComponentFn, null);
 });
 
 QUnit.test("tc:selectBooleanCheckbox", function (assert) {
-  let eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
-  let ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
-  let changeValue = function (componentFn) {
-    let currentEvent = jQueryFrame("#page\\:mainForm\\:outEventName span").text();
+  var eventNames = ["change", "click", "dblclick", "focus", "blur"];
+  var eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
+  var ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
+  var changeValue = function (componentFn) {
+    var currentEvent = jQueryFrame("#page\\:mainForm\\:outEventName span").text();
     if (currentEvent !== "click") {
       componentFn().prop("checked", !componentFn().prop("checked"));
     }
@@ -58,12 +58,12 @@ QUnit.test("tc:selectBooleanCheckbox", function (assert) {
 });
 
 QUnit.test("tc:textarea", function (assert) {
-  let eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:textareaevent\\:\\:field");
-  let ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:textareaajax\\:\\:field");
-  let changeValue = function (componentFn) {
-    let oldValue = componentFn().val();
-    let newValue = "hello";
+  var eventNames = ["change", "click", "dblclick", "focus", "blur"];
+  var eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:textareaevent\\:\\:field");
+  var ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:textareaajax\\:\\:field");
+  var changeValue = function (componentFn) {
+    var oldValue = componentFn().val();
+    var newValue = "hello";
     if (oldValue === "hello") {
       newValue = "hello there!"
     }
@@ -73,15 +73,15 @@ QUnit.test("tc:textarea", function (assert) {
 });
 
 function testEvent(assert, componentName, eventNames, eventComponentFn, ajaxComponentFn, changeValueFunc) {
-  let oldActionCount;
-  let oldActionListenerCount;
-  let oldAjaxListenerCount;
-  let oldValueChangeListenerCount;
-  let oldTimestamp;
+  var oldActionCount;
+  var oldActionListenerCount;
+  var oldAjaxListenerCount;
+  var oldValueChangeListenerCount;
+  var oldTimestamp;
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   for (i = 0; i < eventNames.length; i++) {
-    let eventName = eventNames[i];
+    var 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 () {
-        let id = jQuery(this).attr("id");
+        var 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 c532f3e..b242340 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) {
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleEvent");
-  let oldCounterValues = getCounterValues();
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleEvent");
+  var oldCounterValues = getCounterValues();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     buttonFn().click();
   });
@@ -31,10 +31,10 @@ QUnit.test("Simple Event", function (assert) {
 });
 
 QUnit.test("Simple Ajax", function (assert) {
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleAjax");
-  let oldCounterValues = getCounterValues();
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleAjax");
+  var oldCounterValues = getCounterValues();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     buttonFn().click();
   });
@@ -46,10 +46,10 @@ QUnit.test("Simple Ajax", function (assert) {
 });
 
 QUnit.test("Simple EventAjax", function (assert) {
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleEventAjax");
-  let oldCounterValues = getCounterValues();
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleEventAjax");
+  var oldCounterValues = getCounterValues();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     buttonFn().click();
   });
@@ -61,44 +61,44 @@ QUnit.test("Simple EventAjax", function (assert) {
 });
 
 QUnit.test("Advanced Button: Option 1", function (assert) {
-  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  var optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
   testEventOption(assert, optionFn, buttonFn, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
 });
 
 QUnit.test("Advanced Button: Option 2", function (assert) {
-  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  var optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
 
   testAjaxOption(assert, optionFn, buttonFn, "dblclick", 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1);
 });
 
 QUnit.test("Advanced Button: Option 3", function (assert) {
-  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
-  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  var optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
+  var buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
   testAjaxOption(assert, optionFn, buttonFn, "click", 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1);
 });
 
 QUnit.test("Row: Option 1", function (assert) {
-  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
-  let rowFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
+  var optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
+  var rowFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
   testEventOption(assert, optionFn, rowFn, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
 });
 
 QUnit.test("Row: Option 2", function (assert) {
-  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
-  let rowFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
+  var optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
+  var rowFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
   testAjaxOption(assert, optionFn, rowFn, "dblclick", 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1);
 });
 
 QUnit.test("Row: Option 3", function (assert) {
-  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
-  let rowFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
+  var optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
+  var rowFn = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
   testAjaxOption(assert, optionFn, rowFn, "click", 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1);
 });
 
 QUnit.test("Input: Click Event", function (assert) {
-  let inputFn = jQueryFrameFn("#page\\:mainForm\\:inputClick\\:\\:field");
+  var inputFn = jQueryFrameFn("#page\\:mainForm\\:inputClick\\:\\:field");
   testInputSection(assert, inputFn, "click");
 });
 
@@ -107,11 +107,11 @@ function testEventOption(assert, optionFn, componentFn, event,
                          action1Plus, actionListener1Plus, ajaxListener1Plus,
                          action2Plus, actionListener2Plus, ajaxListener2Plus,
                          action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
-  let operationOutFn = jQueryFrameFn("#page\\:mainForm\\:operationOut");
-  let oldCounterValues = getCounterValues();
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  var operationOutFn = jQueryFrameFn("#page\\:mainForm\\:operationOut");
+  var oldCounterValues = getCounterValues();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().click();
   });
@@ -144,11 +144,11 @@ function testAjaxOption(assert, optionFn, componentFn, event,
                         action1Plus, actionListener1Plus, ajaxListener1Plus,
                         action2Plus, actionListener2Plus, ajaxListener2Plus,
                         action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
-  let operationOutFn = jQueryFrameFn("#page\\:mainForm\\:operationOut");
-  let oldCounterValues = getCounterValues();
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  var operationOutFn = jQueryFrameFn("#page\\:mainForm\\:operationOut");
+  var oldCounterValues = getCounterValues();
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().click();
   });
@@ -177,9 +177,9 @@ function testAjaxOption(assert, optionFn, componentFn, event,
 }
 
 function testInputSection(assert, inputFn, eventName) {
-  let hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  var hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
 
-  let TTT = new TobagoTestTools(assert);
+  var TTT = new TobagoTestTool(assert);
   TTT.action(function () {
     hideFn().click();
   });
@@ -198,20 +198,20 @@ function testInputSection(assert, inputFn, eventName) {
 }
 
 function getCounterValues() {
-  let buttonActionCounter = jQueryFrame("#page\\:mainForm\\:buttonActionCounter.tobago-out").text();
-  let buttonActionListenerCounter = jQueryFrame("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out").text();
+  var buttonActionCounter = jQueryFrame("#page\\:mainForm\\:buttonActionCounter.tobago-out").text();
+  var buttonActionListenerCounter = jQueryFrame("#page\\:mainForm\\:buttonActionListenerCounter.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 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 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 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 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();
+  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();
 
   return [buttonActionCounter, buttonActionListenerCounter,
     actionCount1, actionListenerCount1, ajaxListenerCount1,
@@ -224,7 +224,7 @@ function compareCounterValues(assert, oldCounterValues,
                               action1Plus, actionListener1Plus, ajaxListener1Plus,
                               action2Plus, actionListener2Plus, ajaxListener2Plus,
                               action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  let newCounterValues = getCounterValues();
+  var 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() {
-  let $operationOut = jQueryFrame("#page\\:mainForm\\:operationOut");
+  var $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 266121e..8c7b8d1 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) {
 
-    let $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
-    let $label = jQueryFrame("[for='"+id+"']");
+    var $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
+    var $label = jQueryFrame("[for='"+id+"']");
     assert.equal($field.val(), $label.text());
   }
 
@@ -40,8 +40,8 @@ QUnit.test("inputfield with label", function (assert) {
 
   function testValueEquals(id) {
 
-    let $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
-    let $label = jQueryFrame("[for='"+id+"']");
+    var $field = jQueryFrame(Tobago.Utils.escapeClientId(id));
+    var $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 27da397..9dd2bb7 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) {
-  let $error = jQueryFrame("#page\\:mainForm\\:errorSection .tobago-section-header span");
+  var $error = jQueryFrame("#page\\:mainForm\\:errorSection .tobago-section-header span");
   assert.notEqual($error.text(), "An error has occurred!");
 });
 
 QUnit.test("has no 404", function (assert) {
-  let $error404 = jQueryFrame("#page\\:mainForm\\:pageNotFoundMessage span");
+  var $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 88ee127..efe60cb 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) {
-  let done = assert.async();
+  var done = assert.async();
 
-  let startTime = new Date().getTime();
-  let contentWindowName = "";
-  let waitingDone = false;
-  let interval = setInterval(function () {
+  var startTime = new Date().getTime();
+  var contentWindowName = "";
+  var waitingDone = false;
+  var 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,194 +45,15 @@ QUnit.test("wait for test", function (assert) {
 
 QUnit.test("duplicated IDs", function (assert) {
   function getDuplicatedIDs() {
-    let duplicatedIDs = [];
+    var duplicatedIDs = [];
     jQueryFrame('[id]').each(function () {
-      let ids = jQueryFrame('[id="' + this.id + '"]');
+      var ids = jQueryFrame('[id="' + this.id + '"]');
       if (ids.length > 1 && ids[0] === this)
         duplicatedIDs.push(this.id);
     });
     return duplicatedIDs;
   }
 
-  let duplicatedIDs = getDuplicatedIDs();
+  var duplicatedIDs = getDuplicatedIDs();
   assert.equal(duplicatedIDs.length, 0, "duplicated IDs are: " + duplicatedIDs);
 });
-
-function TobagoTestTools(assert) {
-  this.assert = assert;
-  this.steps = [];
-}
-
-TobagoTestTools.stepType = {
-  ACTION: 1,
-  WAIT_RESPONSE: 2,
-  WAIT_MS: 3,
-  ASSERTS: 4
-};
-TobagoTestTools.prototype = {
-  action: function (func) {
-    this.steps.push({
-      type: TobagoTestTools.stepType.ACTION,
-      func: func
-    })
-  },
-  waitForResponse: function () {
-    this.steps.push({
-      type: TobagoTestTools.stepType.WAIT_RESPONSE
-    })
-  },
-  waitMs: function (ms) {
-    this.steps.push({
-      type: TobagoTestTools.stepType.WAIT_MS,
-      ms: ms ? ms : 0
-    })
-  },
-  asserts: function (numOfAssertions, func) {
-    this.steps.push({
-      type: TobagoTestTools.stepType.ASSERTS,
-      numOfAssertions: numOfAssertions ? numOfAssertions : 0,
-      func: func
-    })
-  },
-  startTest: function () {
-    let steps = this.steps.slice(0);
-    let stepStarted = 0;
-    let stepFinished = 0;
-    let responses = 0;
-    let timeoutTimestamp = Date.now();
-
-    function getAssertExpect() {
-      let expect = 0;
-      steps.forEach(function (step) {
-        if (step.type === TobagoTestTools.stepType.ASSERTS) {
-          expect += step.numOfAssertions;
-        }
-      });
-      return expect;
-    }
-
-    function getAssertAsync() {
-      let async = 0;
-      steps.forEach(function (step) {
-        if (step.type === TobagoTestTools.stepType.ASSERTS) {
-          async++;
-        }
-      });
-      return async;
-    }
-
-    this.assert.expect(getAssertExpect());
-    let done = this.assert.async(getAssertAsync());
-    let assert = this.assert;
-
-    function isFinished() {
-      return stepStarted >= steps.length && stepFinished >= steps.length;
-    }
-
-    function isTimeout() {
-      return Date.now() > timeoutTimestamp + 20000;
-    }
-
-    function startNextPhase() {
-      return stepStarted === stepFinished;
-    }
-
-    function resetTimeout() {
-      timeoutTimestamp = Date.now();
-    }
-
-    function increaseStepFinished() {
-      stepFinished++;
-      resetTimeout();
-    }
-
-    function detectAjaxResponse() {
-      if (!isFinished() && !isTimeout()) {
-        responses++;
-      }
-    }
-
-    function TobagoFrame() {
-      return document.getElementById("page:testframe").contentWindow.Tobago;
-    }
-
-    TobagoFrame().registerListener(detectAjaxResponse, TobagoFrame().Phase.AFTER_UPDATE);
-
-    jQuery("#page\\:testframe").on("load", function () {
-      if (!isFinished() && !isTimeout()) {
-
-        /**
-         * we need to wait for the fully loaded DOM, otherwise an action function may executed to early and some events
-         * like 'componentFn().click()' cannot triggered correctly.
-         */
-        jQuery("#page\\:testframe").ready(function () {
-          responses++;
-        });
-
-        // we need to re-initiate the ajax listener
-        TobagoFrame().registerListener(detectAjaxResponse, TobagoFrame().Phase.AFTER_UPDATE);
-      }
-    });
-
-    function cycle() {
-      if (!isFinished() && !isTimeout()) {
-        if (steps[stepFinished].type === TobagoTestTools.stepType.ACTION) {
-          if (startNextPhase()) {
-            stepStarted++;
-            responses = 0; // maybe next step is 'wait for response'
-            steps[stepFinished].func();
-            increaseStepFinished();
-          }
-
-          if (startNextPhase()) {
-            cycle();
-          } else {
-            setTimeout(cycle, 50);
-          }
-        } else if (steps[stepFinished].type === TobagoTestTools.stepType.WAIT_RESPONSE) {
-          if (startNextPhase()) {
-            stepStarted++;
-          }
-
-          if (responses > 0) {
-            responses = 0;
-            increaseStepFinished();
-          }
-
-          if (startNextPhase()) {
-            cycle();
-          } else {
-            setTimeout(cycle, 50);
-          }
-        } else if (steps[stepFinished].type === TobagoTestTools.stepType.WAIT_MS) {
-          if (startNextPhase()) {
-            stepStarted++;
-            setTimeout(function () {
-              increaseStepFinished();
-              cycle();
-            }, steps[stepFinished].ms);
-          } else {
-            setTimeout(cycle, 50);
-          }
-        } else if (steps[stepFinished].type === TobagoTestTools.stepType.ASSERTS) {
-          if (startNextPhase()) {
-            stepStarted++;
-            steps[stepFinished].func();
-            increaseStepFinished();
-            done();
-          }
-
-          if (startNextPhase()) {
-            cycle();
-          } else {
-            setTimeout(cycle, 50);
-          }
-        }
-      } else if (isTimeout()) {
-        assert.ok(false, "Timeout!");
-      }
-    }
-
-    cycle();
-  }
-};
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
index aba549b..4c2c13b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
@@ -23,6 +23,7 @@
                 xmlns="http://www.w3.org/1999/xhtml">
   <tc:script file="#{request.contextPath}/script/demo.js"/>
   <tc:script file="#{request.contextPath}/script/qunit-1.23.1.js"/>
+  <tc:script file="#{request.contextPath}/tobago/test/tobago-test-tool.js"/>
   <tc:script file="#{request.contextPath}/script/tobago-test.js"/>
   <tc:style file="#{request.contextPath}/style/qunit-1.23.1.css"/>
   <tc:script file="#{request.contextPath}/#{param['accessTest'] ? 'error/error' : param['base']}.test.js"/>
diff --git a/tobago-tool/pom.xml b/tobago-tool/pom.xml
index 5d70112..54de8dd 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -29,6 +29,7 @@
   <modules>
     <module>tobago-tool-apt</module>
     <module>tobago-tool-annotation</module>
+    <module>tobago-tool-test</module>
   </modules>
 
 </project>
diff --git a/tobago-tool/pom.xml b/tobago-tool/tobago-tool-test/pom.xml
similarity index 71%
copy from tobago-tool/pom.xml
copy to tobago-tool/tobago-tool-test/pom.xml
index 5d70112..8d23df2 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/tobago-tool-test/pom.xml
@@ -13,22 +13,17 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License.e.
+ * limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
-    <artifactId>tobago</artifactId>
+    <artifactId>tobago-tool</artifactId>
     <version>4.3.0-SNAPSHOT</version>
   </parent>
-  <packaging>pom</packaging>
-  <name>Tobago Tool</name>
-  <artifactId>tobago-tool</artifactId>
-
-  <modules>
-    <module>tobago-tool-apt</module>
-    <module>tobago-tool-annotation</module>
-  </modules>
-
+  <artifactId>tobago-tool-test</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Tool Test</name>
 </project>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js b/tobago-tool/tobago-tool-test/src/main/resources/META-INF/resources/tobago/test/tobago-test-tool.js
similarity index 64%
copy from tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
copy to tobago-tool/tobago-tool-test/src/main/resources/META-INF/resources/tobago/test/tobago-test-tool.js
index 88ee127..29d1878 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
+++ b/tobago-tool/tobago-tool-test/src/main/resources/META-INF/resources/tobago/test/tobago-test-tool.js
@@ -15,96 +15,53 @@
  * limitations under the License.
  */
 
-function jQueryFrame(expression) {
-  return document.getElementById("page:testframe").contentWindow.jQuery(expression);
-}
-
-function jQueryFrameFn(expression) {
-  return function () {
-    return jQueryFrame(expression);
-  }
-}
-
-QUnit.test("wait for test", function (assert) {
-  let done = assert.async();
-
-  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;
-    if (new Date().getTime() - startTime >= 20000 || waitingDone) {
-      clearInterval(interval);
-      assert.ok(waitingDone);
-      done();
-    }
-  }, 50);
-});
-
-QUnit.test("duplicated IDs", function (assert) {
-  function getDuplicatedIDs() {
-    let duplicatedIDs = [];
-    jQueryFrame('[id]').each(function () {
-      let ids = jQueryFrame('[id="' + this.id + '"]');
-      if (ids.length > 1 && ids[0] === this)
-        duplicatedIDs.push(this.id);
-    });
-    return duplicatedIDs;
-  }
-
-  let duplicatedIDs = getDuplicatedIDs();
-  assert.equal(duplicatedIDs.length, 0, "duplicated IDs are: " + duplicatedIDs);
-});
-
-function TobagoTestTools(assert) {
+function TobagoTestTool(assert) {
   this.assert = assert;
   this.steps = [];
 }
 
-TobagoTestTools.stepType = {
+TobagoTestTool.stepType = {
   ACTION: 1,
   WAIT_RESPONSE: 2,
   WAIT_MS: 3,
   ASSERTS: 4
 };
-TobagoTestTools.prototype = {
+TobagoTestTool.prototype = {
   action: function (func) {
     this.steps.push({
-      type: TobagoTestTools.stepType.ACTION,
+      type: TobagoTestTool.stepType.ACTION,
       func: func
     })
   },
   waitForResponse: function () {
     this.steps.push({
-      type: TobagoTestTools.stepType.WAIT_RESPONSE
+      type: TobagoTestTool.stepType.WAIT_RESPONSE
     })
   },
   waitMs: function (ms) {
     this.steps.push({
-      type: TobagoTestTools.stepType.WAIT_MS,
+      type: TobagoTestTool.stepType.WAIT_MS,
       ms: ms ? ms : 0
     })
   },
   asserts: function (numOfAssertions, func) {
     this.steps.push({
-      type: TobagoTestTools.stepType.ASSERTS,
+      type: TobagoTestTool.stepType.ASSERTS,
       numOfAssertions: numOfAssertions ? numOfAssertions : 0,
       func: func
     })
   },
   startTest: function () {
-    let steps = this.steps.slice(0);
-    let stepStarted = 0;
-    let stepFinished = 0;
-    let responses = 0;
-    let timeoutTimestamp = Date.now();
+    var steps = this.steps.slice(0);
+    var stepStarted = 0;
+    var stepFinished = 0;
+    var responses = 0;
+    var timeoutTimestamp = Date.now();
 
     function getAssertExpect() {
-      let expect = 0;
+      var expect = 0;
       steps.forEach(function (step) {
-        if (step.type === TobagoTestTools.stepType.ASSERTS) {
+        if (step.type === TobagoTestTool.stepType.ASSERTS) {
           expect += step.numOfAssertions;
         }
       });
@@ -112,9 +69,9 @@ TobagoTestTools.prototype = {
     }
 
     function getAssertAsync() {
-      let async = 0;
+      var async = 0;
       steps.forEach(function (step) {
-        if (step.type === TobagoTestTools.stepType.ASSERTS) {
+        if (step.type === TobagoTestTool.stepType.ASSERTS) {
           async++;
         }
       });
@@ -122,8 +79,8 @@ TobagoTestTools.prototype = {
     }
 
     this.assert.expect(getAssertExpect());
-    let done = this.assert.async(getAssertAsync());
-    let assert = this.assert;
+    var done = this.assert.async(getAssertAsync());
+    var assert = this.assert;
 
     function isFinished() {
       return stepStarted >= steps.length && stepFinished >= steps.length;
@@ -176,7 +133,7 @@ TobagoTestTools.prototype = {
 
     function cycle() {
       if (!isFinished() && !isTimeout()) {
-        if (steps[stepFinished].type === TobagoTestTools.stepType.ACTION) {
+        if (steps[stepFinished].type === TobagoTestTool.stepType.ACTION) {
           if (startNextPhase()) {
             stepStarted++;
             responses = 0; // maybe next step is 'wait for response'
@@ -189,7 +146,7 @@ TobagoTestTools.prototype = {
           } else {
             setTimeout(cycle, 50);
           }
-        } else if (steps[stepFinished].type === TobagoTestTools.stepType.WAIT_RESPONSE) {
+        } else if (steps[stepFinished].type === TobagoTestTool.stepType.WAIT_RESPONSE) {
           if (startNextPhase()) {
             stepStarted++;
           }
@@ -204,7 +161,7 @@ TobagoTestTools.prototype = {
           } else {
             setTimeout(cycle, 50);
           }
-        } else if (steps[stepFinished].type === TobagoTestTools.stepType.WAIT_MS) {
+        } else if (steps[stepFinished].type === TobagoTestTool.stepType.WAIT_MS) {
           if (startNextPhase()) {
             stepStarted++;
             setTimeout(function () {
@@ -214,7 +171,7 @@ TobagoTestTools.prototype = {
           } else {
             setTimeout(cycle, 50);
           }
-        } else if (steps[stepFinished].type === TobagoTestTools.stepType.ASSERTS) {
+        } else if (steps[stepFinished].type === TobagoTestTool.stepType.ASSERTS) {
           if (startNextPhase()) {
             stepStarted++;
             steps[stepFinished].func();