myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hno...@apache.org
Subject [myfaces-tobago] branch master updated: improve tests: better names for jQueryFrameFn() variables
Date Fri, 08 Jun 2018 11:40:33 GMT
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 1c4c697  improve tests: better names for jQueryFrameFn() variables
1c4c697 is described below

commit 1c4c697da63e1bd3964668165350e3f983b5a15f
Author: Henning Noeth <hnoeth@apache.org>
AuthorDate: Fri Jun 8 13:40:15 2018 +0200

    improve tests: better names for jQueryFrameFn() variables
---
 .../20-component/010-input/10-in/in.test.js        |  26 +-
 .../010-input/20-suggest/suggest.test.js           |  64 +--
 .../20-component/010-input/40-date/date.test.js    | 112 +++---
 .../selectBooleanCheckbox.test.js                  |  88 ++---
 .../20-selectOneChoice/selectOneChoice.test.js     |  64 +--
 .../30-selectOneRadio/selectOneRadio.test.js       |  80 ++--
 .../40-selectOneListbox/selectOneListbox.test.js   |  72 ++--
 .../selectManyCheckbox.test.js                     |  84 ++--
 .../20-component/050-container/10-box/box.test.js  |  88 ++---
 .../content/20-component/060-popup/popup.test.js   | 212 +++++-----
 .../content/20-component/070-tab/tab.test.js       |  90 ++---
 .../080-sheet/10-sort/sheet-sorting.test.js        | 432 ++++++++++-----------
 .../080-sheet/30-event/sheet-event.test.js         | 142 +++----
 .../090-tree/01-select/tree-select.test.js         | 154 ++++----
 .../06-validation/00/content-validation.test.js    | 162 ++++----
 .../06-validation/01/validation-jsr303.test.js     |  60 +--
 .../08-form/10-required/form-required.test.js      | 194 ++++-----
 .../30-concept/08-form/20-ajax/form-ajax.test.js   | 396 +++++++++----------
 .../webapp/content/30-concept/08-form/form.test.js |  52 +--
 .../30-concept/51-for-each/for-each.test.js        |  38 +-
 .../00-collapsible-box/collapsible-box.test.js     | 218 +++++------
 .../10-collapsible-popup/collapsible-popup.test.js | 138 +++----
 .../20-collapsible-panel/collapsible-panel.test.js | 214 +++++-----
 .../collapsible-section.test.js                    | 214 +++++-----
 .../15-suggest-method/suggest-method.test.js       |  20 +-
 .../1020-suggest-quotMark/suggest-quotMark.test.js |  10 +-
 .../4050-ajax-dropdown/ajax-dropdown.test.js       |  24 +-
 .../40-test/4000-button+link/button+link.test.js   |  68 ++--
 .../40000-style/100-headings/headings.test.js      |  70 ++--
 .../20-ajax-execute/ajax-execute.test.js           |  60 +--
 .../ajax-special-character.test.js                 |  22 +-
 .../content/40-test/6000-event/event.test.js       |  56 +--
 .../content/40-test/6500-behavior/behavior.test.js |  92 ++---
 33 files changed, 1908 insertions(+), 1908 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
index 56258a3..be1a04e 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,41 +16,41 @@
  */
 
 QUnit.test("inputfield with label", function (assert) {
-  let $label = jQueryFrameFn("#page\\:mainForm\\:iNormal > label");
-  let $inputField = jQueryFrameFn("#page\\:mainForm\\:iNormal\\:\\:field");
+  let labelFn = jQueryFrameFn("#page\\:mainForm\\:iNormal > label");
+  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:iNormal\\:\\:field");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
-    assert.equal($label().text(), "Input");
-    assert.equal($inputField().val(), "Some Text");
+    assert.equal(labelFn().text(), "Input");
+    assert.equal(inputFieldFn().val(), "Some Text");
   });
   TTT.action(function () {
-    $inputField().val("abc");
+    inputFieldFn().val("abc");
   });
   TTT.asserts(1, function () {
-    assert.equal($inputField().val(), "abc");
+    assert.equal(inputFieldFn().val(), "abc");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax change event", function (assert) {
-  let $inputField = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
-  let $outputField = jQueryFrameFn("#page\\:mainForm\\:outputAjax span:first");
+  let inputFieldFn = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+  let outputFieldFn = jQueryFrameFn("#page\\:mainForm\\:outputAjax span:first");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
-    assert.equal($inputField().val(), "");
-    assert.equal($outputField().text(), "");
+    assert.equal(inputFieldFn().val(), "");
+    assert.equal(outputFieldFn().text(), "");
   });
   TTT.action(function () {
-    $inputField().val("qwe").trigger("change");
+    inputFieldFn().val("qwe").trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($inputField().val(), "qwe");
+    assert.equal(inputFieldFn().val(), "qwe");
   });
   TTT.asserts(1, function () {
-    assert.equal($outputField().text(), "qwe");
+    assert.equal(outputFieldFn().text(), "qwe");
   });
   TTT.startTest();
 });
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 63afe1b..c17a5eb 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
@@ -44,85 +44,85 @@ QUnit.test("Basics: 'Mars'", function (assert) {
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  let $in = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:inBasic");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val(inputString).trigger('input');
+    inFn().val(inputString).trigger('input');
   });
   TTT.waitForResponse();
   TTT.asserts(expectedLength + 1, function () {
-    assert.equal($suggestions().length, expectedLength);
+    assert.equal(suggestionsFn().length, expectedLength);
     for (i = 0; i < expectedLength; i++) {
-      assert.ok($suggestions().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
+      assert.ok(suggestionsFn().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
     }
   });
   TTT.startTest();
 }
 
 QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
-  let $in = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:inBasic");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:inBasic\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("eus").trigger('input');
+    inFn().val("eus").trigger('input');
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal($in().val(), "eus");
-    assert.equal($suggestions().length, 3);
-    assert.equal($suggestions().eq(0).find("strong").text(), "eus");
-    assert.equal($suggestions().eq(1).find("strong").text(), "eus");
-    assert.equal($suggestions().eq(2).find("strong").text(), "eus");
+    assert.equal(inFn().val(), "eus");
+    assert.equal(suggestionsFn().length, 3);
+    assert.equal(suggestionsFn().eq(0).find("strong").text(), "eus");
+    assert.equal(suggestionsFn().eq(1).find("strong").text(), "eus");
+    assert.equal(suggestionsFn().eq(2).find("strong").text(), "eus");
   });
   TTT.action(function () {
-    $suggestions().eq(0).click();
+    suggestionsFn().eq(0).click();
   });
   TTT.asserts(1, function () {
-    assert.equal($in().val(), "Prometheus");
+    assert.equal(inFn().val(), "Prometheus");
 
   });
   TTT.startTest();
 });
 
 QUnit.test("Advanced: 'C'", function (assert) {
-  let $in = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
   let suggestionDelay = 2000;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("C").trigger('input');
+    inFn().val("C").trigger('input');
   });
   TTT.waitMs(suggestionDelay);
   TTT.asserts(1, function () {
-    assert.equal($suggestions().length, 0);
+    assert.equal(suggestionsFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Advanced: 'Ca'", function (assert) {
-  let $in = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:inAdvanced");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
   let suggestionDelay = 2000;
   let startTime = Date.now();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("Ca").trigger('input');
+    inFn().val("Ca").trigger('input');
   });
   TTT.waitMs(200); // default suggestion delay
   TTT.asserts(1, function () {
     // Nothing happen, because the delay is greater than the default delay.
-    assert.equal($suggestions().length, 0);
+    assert.equal(suggestionsFn().length, 0);
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($suggestions().length, 2);
-    assert.equal($suggestions().eq(0).find("strong").text(), "Ca");
-    assert.equal($suggestions().eq(1).find("strong").text(), "Ca");
+    assert.equal(suggestionsFn().length, 2);
+    assert.equal(suggestionsFn().eq(0).find("strong").text(), "Ca");
+    assert.equal(suggestionsFn().eq(1).find("strong").text(), "Ca");
     assert.ok(Date.now() - startTime >= suggestionDelay, "Delay for suggest popup must be greater/equal "
         + suggestionDelay);
   });
@@ -130,17 +130,17 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
 });
 
 QUnit.test("Client side: 'Ju'", function (assert) {
-  let $in = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:inClient");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:inClient\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("Ju").trigger('input');
+    inFn().val("Ju").trigger('input');
   });
   TTT.asserts(3, function () {
-    assert.equal($suggestions().length, 2);
-    assert.equal($suggestions().eq(0).find("strong").text(), "Ju");
-    assert.equal($suggestions().eq(1).find("strong").text(), "Ju");
+    assert.equal(suggestionsFn().length, 2);
+    assert.equal(suggestionsFn().eq(0).find("strong").text(), "Ju");
+    assert.equal(suggestionsFn().eq(1).find("strong").text(), "Ju");
   });
   TTT.startTest();
 });
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 04638c0..7c99449 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
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-function getToday($dateField) {
-  let tobagoToday = $dateField().data("tobago-today");
+function getToday(dateFieldFn) {
+  let tobagoToday = dateFieldFn().data("tobago-today");
   let todayArray = tobagoToday.split("-");
   return todayArray[2] + "." + todayArray[1] + "." + todayArray[0];
 }
@@ -24,119 +24,119 @@ function getToday($dateField) {
 QUnit.test("date with label", function (assert) {
   assert.expect(5);
 
-  let $label = jQueryFrameFn("#page\\:mainForm\\:dNormal > label");
-  let $dateField = jQueryFrameFn("#page\\:mainForm\\:dNormal\\:\\:field");
-  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:dNormal button");
-  let $dayToday = jQueryFrameFn(".day.today");
-  let today = getToday($dateField);
+  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);
 
-  assert.equal($label().text(), "Date");
-  assert.equal($dateField().val(), today);
+  assert.equal(labelFn().text(), "Date");
+  assert.equal(dateFieldFn().val(), today);
 
-  $dateField().val("32.05.2016");
-  $dateButton().click();
+  dateFieldFn().val("32.05.2016");
+  dateButtonFn().click();
 
-  assert.equal($dateField().val(), today);
-  assert.equal($dayToday().hasClass("past"), false);
-  assert.equal($dayToday().prevAll(".past").length, $dayToday().prevAll().length);
+  assert.equal(dateFieldFn().val(), today);
+  assert.equal(dayTodayFn().hasClass("past"), false);
+  assert.equal(dayTodayFn().prevAll(".past").length, dayTodayFn().prevAll().length);
 
-  $dateButton().click(); // IE11: close datetimepicker for next test
+  dateButtonFn().click(); // IE11: close datetimepicker for next test
 });
 
 QUnit.test("date+time pattern", function (assert) {
-  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
-  let $datepicker = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  let $firstLi = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
-  let $lastLi = jQueryFrameFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
-  let $togglePickerButton = jQueryFrameFn(".bootstrap-datetimepicker-widget .picker-switch a");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $dateButton().click();
+    dateButtonFn().click();
   });
   TTT.asserts(3, function () {
-    assert.equal($datepicker().length, 1);
-    assert.notEqual($firstLi().css("display"), "none"); //block
-    assert.equal($lastLi().css("display"), "none");
+    assert.equal(datepickerFn().length, 1);
+    assert.notEqual(firstLiFn().css("display"), "none"); //block
+    assert.equal(lastLiFn().css("display"), "none");
   });
   TTT.action(function () {
-    $togglePickerButton().click();
+    togglePickerButtonFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.equal($firstLi().css("display"), "none");
-    assert.notEqual($lastLi().css("display"), "none"); //block
+    assert.equal(firstLiFn().css("display"), "none");
+    assert.notEqual(lastLiFn().css("display"), "none"); //block
   });
   TTT.action(function () {
-    $dateButton().click(); // IE11: close datetimepicker for next test
+    dateButtonFn().click(); // IE11: close datetimepicker for next test
   });
   TTT.startTest();
 });
 
 QUnit.test("submit", function (assert) {
-  let $dateField = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
-  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:input button");
-  let $outField = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:output span");
-  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:formSubmit\\:button");
-  let $widget = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  let $days = jQueryFrameFn(".bootstrap-datetimepicker-widget .day");
+  let 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;
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
-    assert.equal($dateField().val(), "22.05.2016");
-    assert.equal($outField().text(), "22.05.2016");
+    assert.equal(dateFieldFn().val(), "22.05.2016");
+    assert.equal(outFieldFn().text(), "22.05.2016");
   });
   TTT.action(function () {
-    $dateButton().click();
+    dateButtonFn().click();
   });
   TTT.asserts(2, function () {
-    assert.ok($widget().get(0), ".bootstrap-datetimepicker-widget should be available");
+    assert.ok(widgetFn().get(0), ".bootstrap-datetimepicker-widget should be available");
 
-    for (i = 0; i < $days().length; i++) {
-      if ($days().eq(i).text() === "22") {
+    for (i = 0; i < daysFn().length; i++) {
+      if (daysFn().eq(i).text() === "22") {
         day22 = i;
         break;
       }
     }
-    assert.ok($days().get(day22 + 10));
+    assert.ok(daysFn().get(day22 + 10));
   });
   TTT.action(function () {
-    $days().get(day22 + 10).click(); // Choose '01.06.2016'.
+    daysFn().get(day22 + 10).click(); // Choose '01.06.2016'.
   });
   TTT.asserts(1, function () {
-    assert.equal($dateField().val(), "01.06.2016");
+    assert.equal(dateFieldFn().val(), "01.06.2016");
   });
   TTT.action(function () {
-    $submitButton().click();
+    submitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outField().text(), "01.06.2016");
+    assert.equal(outFieldFn().text(), "01.06.2016");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax", function (assert) {
-  let $dateField = jQueryFrameFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
-  let $dateButton = jQueryFrameFn("#page\\:mainForm\\:ajaxinput button");
-  let $outField = jQueryFrameFn("#page\\:mainForm\\:outputfield span");
-  let $widget = jQueryFrameFn(".bootstrap-datetimepicker-widget");
-  let today = getToday($dateField);
+  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);
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(2, function () {
-    assert.equal($dateField().val(), "");
-    assert.equal($outField().text(), "");
+    assert.equal(dateFieldFn().val(), "");
+    assert.equal(outFieldFn().text(), "");
   });
   TTT.action(function () {
-    $dateButton().click();
+    dateButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.ok($widget().get(0));
-    assert.equal($dateField().val(), today);
-    assert.equal($outField().text(), today);
+    assert.ok(widgetFn().get(0));
+    assert.equal(dateFieldFn().val(), today);
+    assert.equal(outFieldFn().text(), today);
   });
   TTT.startTest();
 });
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 f2a801e..4500622 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,133 +16,133 @@
  */
 
 QUnit.test("submit: select A", function (assert) {
-  let $selectA = jQueryFrameFn("#page\\:mainForm\\:selectA input");
-  let $selectB = jQueryFrameFn("#page\\:mainForm\\:selectB input");
-  let $selectC = jQueryFrameFn("#page\\:mainForm\\:selectC input");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectA().prop("checked", true);
-    $selectB().prop("checked", false);
-    $selectC().prop("checked", false);
-    $submit().click();
+    selectAFn().prop("checked", true);
+    selectBFn().prop("checked", false);
+    selectCFn().prop("checked", false);
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "A ");
+    assert.equal(outputFn().text(), "A ");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit: select B and C", function (assert) {
-  let $selectA = jQueryFrameFn("#page\\:mainForm\\:selectA input");
-  let $selectB = jQueryFrameFn("#page\\:mainForm\\:selectB input");
-  let $selectC = jQueryFrameFn("#page\\:mainForm\\:selectC input");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:submitOutput span");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectA().prop("checked", false);
-    $selectB().prop("checked", true);
-    $selectC().prop("checked", true);
-    $submit().click();
+    selectAFn().prop("checked", false);
+    selectBFn().prop("checked", true);
+    selectCFn().prop("checked", true);
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "B C ");
+    assert.equal(outputFn().text(), "B C ");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select D", function (assert) {
-  let $selectD = jQueryFrameFn("#page\\:mainForm\\:selectD input");
-  let $outputD = jQueryFrameFn("#page\\:mainForm\\:outputD span");
+  let selectDFn = jQueryFrameFn("#page\\:mainForm\\:selectD input");
+  let outputDFn = jQueryFrameFn("#page\\:mainForm\\:outputD span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectD().prop("checked", true).trigger("change");
+    selectDFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outputD().text(), "true");
+    assert.equal(outputDFn().text(), "true");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: deselect D", function (assert) {
-  let $selectD = jQueryFrameFn("#page\\:mainForm\\:selectD input");
-  let $outputD = jQueryFrameFn("#page\\:mainForm\\:outputD span");
+  let selectDFn = jQueryFrameFn("#page\\:mainForm\\:selectD input");
+  let outputDFn = jQueryFrameFn("#page\\:mainForm\\:outputD span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectD().prop("checked", false).trigger("change");
+    selectDFn().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outputD().text(), "false");
+    assert.equal(outputDFn().text(), "false");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select E", function (assert) {
-  let $selectE = jQueryFrameFn("#page\\:mainForm\\:selectE input");
-  let $outputE = jQueryFrameFn("#page\\:mainForm\\:outputE span");
+  let selectEFn = jQueryFrameFn("#page\\:mainForm\\:selectE input");
+  let outputEFn = jQueryFrameFn("#page\\:mainForm\\:outputE span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectE().prop("checked", true).trigger("change");
+    selectEFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outputE().text(), "true");
+    assert.equal(outputEFn().text(), "true");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: deselect E", function (assert) {
-  let $selectE = jQueryFrameFn("#page\\:mainForm\\:selectE input");
-  let $outputE = jQueryFrameFn("#page\\:mainForm\\:outputE span");
+  let selectEFn = jQueryFrameFn("#page\\:mainForm\\:selectE input");
+  let outputEFn = jQueryFrameFn("#page\\:mainForm\\:outputE span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectE().prop("checked", false).trigger("change");
+    selectEFn().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outputE().text(), "false");
+    assert.equal(outputEFn().text(), "false");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select F", function (assert) {
-  let $selectF = jQueryFrameFn("#page\\:mainForm\\:selectF input");
-  let $outputF = jQueryFrameFn("#page\\:mainForm\\:outputF span");
+  let selectFFn = jQueryFrameFn("#page\\:mainForm\\:selectF input");
+  let outputFFn = jQueryFrameFn("#page\\:mainForm\\:outputF span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectF().prop("checked", true).trigger("change");
+    selectFFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outputF().text(), "true");
+    assert.equal(outputFFn().text(), "true");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: deselect F", function (assert) {
-  let $selectF = jQueryFrameFn("#page\\:mainForm\\:selectF input");
-  let $outputF = jQueryFrameFn("#page\\:mainForm\\:outputF span");
+  let selectFFn = jQueryFrameFn("#page\\:mainForm\\:selectF input");
+  let outputFFn = jQueryFrameFn("#page\\:mainForm\\:outputF span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectF().prop("checked", false).trigger("change");
+    selectFFn().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($outputF().text(), "false");
+    assert.equal(outputFFn().text(), "false");
   });
   TTT.startTest();
 });
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 2788c41..a9b511d 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,78 +16,78 @@
  */
 
 QUnit.test("submit: Alice", function (assert) {
-  let $alice = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
-  let $bob = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $alice().prop("selected", true);
-    $bob().prop("selected", false);
-    $submit().click();
+    aliceFn().prop("selected", true);
+    bobFn().prop("selected", false);
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Alice Anderson");
+    assert.equal(outputFn().text(), "Alice Anderson");
 
   });
   TTT.startTest();
 });
 
 QUnit.test("submit: Bob", function (assert) {
-  let $alice = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Alice')");
-  let $bob = jQueryFrameFn("#page\\:mainForm\\:selectPerson\\:\\:field option:contains('Bob')");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:outputPerson span");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $alice().prop("selected", false);
-    $bob().prop("selected", true);
-    $submit().click();
+    aliceFn().prop("selected", false);
+    bobFn().prop("selected", true);
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Bob Brunch");
+    assert.equal(outputFn().text(), "Bob Brunch");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select Mars", function (assert) {
-  let $mars = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
-  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
-  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $jupiter().prop("selected", false);
-    $mars().prop("selected", true).trigger("change");
+    jupiterFn().prop("selected", false);
+    marsFn().prop("selected", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($moons().eq(0).text().trim(), "Phobos");
-    assert.equal($moons().eq(1).text().trim(), "Deimos");
+    assert.equal(moonsFn().eq(0).text().trim(), "Phobos");
+    assert.equal(moonsFn().eq(1).text().trim(), "Deimos");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select Jupiter", function (assert) {
-  let $mars = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Mars')");
-  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:selectPlanet\\:\\:field option:contains('Jupiter')");
-  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $mars().prop("selected", false);
-    $jupiter().prop("selected", true).trigger("change");
+    marsFn().prop("selected", false);
+    jupiterFn().prop("selected", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($moons().eq(0).text().trim(), "Europa");
-    assert.equal($moons().eq(1).text().trim(), "Ganymed");
-    assert.equal($moons().eq(2).text().trim(), "Io");
-    assert.equal($moons().eq(3).text().trim(), "Kallisto");
+    assert.equal(moonsFn().eq(0).text().trim(), "Europa");
+    assert.equal(moonsFn().eq(1).text().trim(), "Ganymed");
+    assert.equal(moonsFn().eq(2).text().trim(), "Io");
+    assert.equal(moonsFn().eq(3).text().trim(), "Kallisto");
   });
   TTT.startTest();
 });
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 05dcc3c..b09823a 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,85 +16,85 @@
  */
 
 QUnit.test("submit: Addition (2 + 4)", function (assert) {
-  let $number1 = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
-  let $number2 = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
-  let $submitAdd = jQueryFrameFn("#page\\:mainForm\\:submitAdd");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $number1().eq(0).prop("checked", false);
-    $number1().eq(1).prop("checked", true); // Select 2
-    $number1().eq(2).prop("checked", false);
-    $number2().eq(0).prop("checked", false);
-    $number2().eq(1).prop("checked", false);
-    $number2().eq(2).prop("checked", true); // Select 4
-    $submitAdd().click();
+    number1Fn().eq(0).prop("checked", false);
+    number1Fn().eq(1).prop("checked", true); // Select 2
+    number1Fn().eq(2).prop("checked", false);
+    number2Fn().eq(0).prop("checked", false);
+    number2Fn().eq(1).prop("checked", false);
+    number2Fn().eq(2).prop("checked", true); // Select 4
+    submitAddFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "6");
+    assert.equal(outputFn().text(), "6");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit: Subtraction (4 - 1)", function (assert) {
-  let $number1 = jQueryFrameFn("#page\\:mainForm\\:selectNum1 input");
-  let $number2 = jQueryFrameFn("#page\\:mainForm\\:selectNum2 input");
-  let $submitSub = jQueryFrameFn("#page\\:mainForm\\:submitSub");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $number1().eq(0).prop("checked", false);
-    $number1().eq(1).prop("checked", false);
-    $number1().eq(2).prop("checked", true); // Select 4
-    $number2().eq(0).prop("checked", true); // Select 1
-    $number2().eq(1).prop("checked", false);
-    $number2().eq(2).prop("checked", false);
-    $submitSub().click();
+    number1Fn().eq(0).prop("checked", false);
+    number1Fn().eq(1).prop("checked", false);
+    number1Fn().eq(2).prop("checked", true); // Select 4
+    number2Fn().eq(0).prop("checked", true); // Select 1
+    number2Fn().eq(1).prop("checked", false);
+    number2Fn().eq(2).prop("checked", false);
+    submitSubFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "3");
+    assert.equal(outputFn().text(), "3");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select Mars", function (assert) {
-  let $planet = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
-  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
+  let planetFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
+  let moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $planet().eq(0).prop("checked", false);
-    $planet().eq(2).prop("checked", false);
-    $planet().eq(1).prop("checked", true).trigger("change"); // Mars.
+    planetFn().eq(0).prop("checked", false);
+    planetFn().eq(2).prop("checked", false);
+    planetFn().eq(1).prop("checked", true).trigger("change"); // Mars.
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($moons().eq(0).text(), "Phobos");
-    assert.equal($moons().eq(1).text(), "Deimos");
+    assert.equal(moonsFn().eq(0).text(), "Phobos");
+    assert.equal(moonsFn().eq(1).text(), "Deimos");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select Jupiter", function (assert) {
-  let $planet = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
-  let $moons = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
+  let planetFn = jQueryFrameFn("#page\\:mainForm\\:selectPlanet input");
+  let moonsFn = jQueryFrameFn("#page\\:mainForm\\:moonradio label.form-check-label");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $planet().eq(0).prop("checked", false);
-    $planet().eq(1).prop("checked", false);
-    $planet().eq(2).prop("checked", true).trigger("change"); // Jupiter.
+    planetFn().eq(0).prop("checked", false);
+    planetFn().eq(1).prop("checked", false);
+    planetFn().eq(2).prop("checked", true).trigger("change"); // Jupiter.
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($moons().eq(0).text(), "Europa");
-    assert.equal($moons().eq(1).text(), "Ganymed");
-    assert.equal($moons().eq(2).text(), "Io");
-    assert.equal($moons().eq(3).text(), "Kallisto");
+    assert.equal(moonsFn().eq(0).text(), "Europa");
+    assert.equal(moonsFn().eq(1).text(), "Ganymed");
+    assert.equal(moonsFn().eq(2).text(), "Io");
+    assert.equal(moonsFn().eq(3).text(), "Kallisto");
   });
   TTT.startTest();
 });
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 2e28732..2f641ca 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,82 +16,82 @@
  */
 
 QUnit.test("submit: select 'Nile'", function (assert) {
-  let $rivers = jQueryFrameFn("#page\\:mainForm\\:riverList option");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
+  let riversFn = jQueryFrameFn("#page\\:mainForm\\:riverList option");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $rivers().eq(0).prop("selected", true); // Nile
-    $rivers().eq(1).prop("selected", false); // Amazon
-    $rivers().eq(2).prop("selected", false); // Yangtze
-    $rivers().eq(3).prop("selected", false); // Yellow River
-    $rivers().eq(4).prop("selected", false); // Paraná River
-    $submit().click();
+    riversFn().eq(0).prop("selected", true); // Nile
+    riversFn().eq(1).prop("selected", false); // Amazon
+    riversFn().eq(2).prop("selected", false); // Yangtze
+    riversFn().eq(3).prop("selected", false); // Yellow River
+    riversFn().eq(4).prop("selected", false); // Paraná River
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "6853 km");
+    assert.equal(outputFn().text(), "6853 km");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit: select 'Yangtze'", function (assert) {
-  let $rivers = jQueryFrameFn("#page\\:mainForm\\:riverList option");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
+  let riversFn = jQueryFrameFn("#page\\:mainForm\\:riverList option");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:riverSubmit");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:riverOutput span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $rivers().eq(0).prop("selected", false); // Nile
-    $rivers().eq(1).prop("selected", false); // Amazon
-    $rivers().eq(2).prop("selected", true); // Yangtze
-    $rivers().eq(3).prop("selected", false); // Yellow River
-    $rivers().eq(4).prop("selected", false); // Paraná River
-    $submit().click();
+    riversFn().eq(0).prop("selected", false); // Nile
+    riversFn().eq(1).prop("selected", false); // Amazon
+    riversFn().eq(2).prop("selected", true); // Yangtze
+    riversFn().eq(3).prop("selected", false); // Yellow River
+    riversFn().eq(4).prop("selected", false); // Paraná River
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "6300 km");
+    assert.equal(outputFn().text(), "6300 km");
 
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select Everest", function (assert) {
-  let $mountains = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
+  let mountainsFn = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $mountains().eq(1).prop("selected", false);
-    $mountains().eq(2).prop("selected", false);
-    $mountains().eq(3).prop("selected", false);
-    $mountains().eq(4).prop("selected", false);
-    $mountains().eq(0).prop("selected", true).trigger("change"); // Everest
+    mountainsFn().eq(1).prop("selected", false);
+    mountainsFn().eq(2).prop("selected", false);
+    mountainsFn().eq(3).prop("selected", false);
+    mountainsFn().eq(4).prop("selected", false);
+    mountainsFn().eq(0).prop("selected", true).trigger("change"); // Everest
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "8848 m");
+    assert.equal(outputFn().text(), "8848 m");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: select Makalu", function (assert) {
-  let $mountains = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
+  let mountainsFn = jQueryFrameFn("#page\\:mainForm\\:mountainList option");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:selectedMountain span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $mountains().eq(0).prop("selected", false);
-    $mountains().eq(1).prop("selected", false);
-    $mountains().eq(2).prop("selected", false);
-    $mountains().eq(3).prop("selected", false);
-    $mountains().eq(4).prop("selected", true).trigger("change"); // Everest
+    mountainsFn().eq(0).prop("selected", false);
+    mountainsFn().eq(1).prop("selected", false);
+    mountainsFn().eq(2).prop("selected", false);
+    mountainsFn().eq(3).prop("selected", false);
+    mountainsFn().eq(4).prop("selected", true).trigger("change"); // Everest
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "8481 m");
+    assert.equal(outputFn().text(), "8481 m");
   });
   TTT.startTest();
 });
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 386fa47..6dd3170 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,107 +16,107 @@
  */
 
 QUnit.test("submit: select cat", function (assert) {
-  let $animals = jQueryFrameFn("#page\\:mainForm\\:animals input");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
+  let animalsFn = jQueryFrameFn("#page\\:mainForm\\:animals input");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $animals().eq(0).prop("checked", true);
-    $animals().eq(1).prop("checked", false);
-    $animals().eq(2).prop("checked", false);
-    $animals().eq(3).prop("checked", false);
-    $submit().click();
+    animalsFn().eq(0).prop("checked", true);
+    animalsFn().eq(1).prop("checked", false);
+    animalsFn().eq(2).prop("checked", false);
+    animalsFn().eq(3).prop("checked", false);
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Cat ");
+    assert.equal(outputFn().text(), "Cat ");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit: select fox and rabbit", function (assert) {
-  let $animals = jQueryFrameFn("#page\\:mainForm\\:animals input");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
+  let animalsFn = jQueryFrameFn("#page\\:mainForm\\:animals input");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:submit");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:animalsOutput span");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $animals().eq(0).prop("checked", false);
-    $animals().eq(1).prop("checked", false);
-    $animals().eq(2).prop("checked", true);
-    $animals().eq(3).prop("checked", true);
-    $submit().click();
+    animalsFn().eq(0).prop("checked", false);
+    animalsFn().eq(1).prop("checked", false);
+    animalsFn().eq(2).prop("checked", true);
+    animalsFn().eq(3).prop("checked", true);
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Fox Rabbit ");
+    assert.equal(outputFn().text(), "Fox Rabbit ");
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: click 'Two'", function (assert) {
-  let $number2 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let number2Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
   let newOutputValue;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    if ($number2().prop("checked")) {
-      newOutputValue = parseInt($output().text()) - 2;
-      $number2().prop("checked", false).trigger("change");
+    if (number2Fn().prop("checked")) {
+      newOutputValue = parseInt(outputFn().text()) - 2;
+      number2Fn().prop("checked", false).trigger("change");
     } else {
-      newOutputValue = parseInt($output().text()) + 2;
-      $number2().prop("checked", true).trigger("change");
+      newOutputValue = parseInt(outputFn().text()) + 2;
+      number2Fn().prop("checked", true).trigger("change");
     }
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), newOutputValue);
+    assert.equal(outputFn().text(), newOutputValue);
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: click 'Three'", function (assert) {
-  let $number3 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:2");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let number3Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:2");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
   let newOutputValue;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    if ($number3().prop("checked")) {
-      newOutputValue = parseInt($output().text()) - 3;
-      $number3().prop("checked", false).trigger("change");
+    if (number3Fn().prop("checked")) {
+      newOutputValue = parseInt(outputFn().text()) - 3;
+      number3Fn().prop("checked", false).trigger("change");
     } else {
-      newOutputValue = parseInt($output().text()) + 3;
-      $number3().prop("checked", true).trigger("change");
+      newOutputValue = parseInt(outputFn().text()) + 3;
+      number3Fn().prop("checked", true).trigger("change");
     }
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), newOutputValue);
+    assert.equal(outputFn().text(), newOutputValue);
   });
   TTT.startTest();
 });
 
 QUnit.test("ajax: click 'Two'", function (assert) {
-  let $number2 = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
+  let number2Fn = jQueryFrameFn("#page\\:mainForm\\:numbers\\:\\:1");
+  let outputFn = jQueryFrameFn("#page\\:mainForm\\:resultOutput span");
   let newOutputValue;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    if ($number2().prop("checked")) {
-      newOutputValue = parseInt($output().text()) - 2;
-      $number2().prop("checked", false).trigger("change");
+    if (number2Fn().prop("checked")) {
+      newOutputValue = parseInt(outputFn().text()) - 2;
+      number2Fn().prop("checked", false).trigger("change");
     } else {
-      newOutputValue = parseInt($output().text()) + 2;
-      $number2().prop("checked", true).trigger("change");
+      newOutputValue = parseInt(outputFn().text()) + 2;
+      number2Fn().prop("checked", true).trigger("change");
     }
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), newOutputValue);
+    assert.equal(outputFn().text(), newOutputValue);
   });
   TTT.startTest();
 });
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 e81f297..8f54dae 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,99 +16,99 @@
  */
 
 QUnit.test("Accordion: Box 1: 'hide' to 'show' to 'hide'", function (assert) {
-  let $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox1");
-  let $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox1");
-  let $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox1");
-  let $boxBody = jQueryFrameFn("#page\\:mainForm\\:accordionBox1 .card-body");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(3, function () {
-    assert.equal($showBox().length, 1);
-    assert.equal($hideBox().length, 0);
-    assert.equal($boxBody().text().trim().length, 0);
+    assert.equal(showBoxFn().length, 1);
+    assert.equal(hideBoxFn().length, 0);
+    assert.equal(boxBodyFn().text().trim().length, 0);
   });
   TTT.action(function () {
-    $showBox().click();
+    showBoxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($showBox().length, 0);
-    assert.equal($hideBox().length, 1);
-    assert.notEqual($boxBody().text().trim().length, 0);
+    assert.equal(showBoxFn().length, 0);
+    assert.equal(hideBoxFn().length, 1);
+    assert.notEqual(boxBodyFn().text().trim().length, 0);
   });
   TTT.action(function () {
-    $hideBox().click();
+    hideBoxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($showBox().length, 1);
-    assert.equal($hideBox().length, 0);
-    assert.equal($boxBody().text().trim().length, 0);
+    assert.equal(showBoxFn().length, 1);
+    assert.equal(hideBoxFn().length, 0);
+    assert.equal(boxBodyFn().text().trim().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Accordion: Box 2: 'hide' to 'show' to 'hide'", function (assert) {
-  let $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox2");
-  let $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox2");
-  let $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox2");
-  let $boxBody = jQueryFrameFn("#page\\:mainForm\\:accordionBox2 .card-body");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(3, function () {
-    assert.equal($showBox().length, 1);
-    assert.equal($hideBox().length, 0);
-    assert.equal($boxBody().text().trim().length, 0);
+    assert.equal(showBoxFn().length, 1);
+    assert.equal(hideBoxFn().length, 0);
+    assert.equal(boxBodyFn().text().trim().length, 0);
   });
   TTT.action(function () {
-    $showBox().click();
+    showBoxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($showBox().length, 0);
-    assert.equal($hideBox().length, 1);
-    assert.notEqual($boxBody().text().trim().length, 0);
+    assert.equal(showBoxFn().length, 0);
+    assert.equal(hideBoxFn().length, 1);
+    assert.notEqual(boxBodyFn().text().trim().length, 0);
   });
   TTT.action(function () {
-    $hideBox().click();
+    hideBoxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($showBox().length, 1);
-    assert.equal($hideBox().length, 0);
-    assert.equal($boxBody().text().trim().length, 0);
+    assert.equal(showBoxFn().length, 1);
+    assert.equal(hideBoxFn().length, 0);
+    assert.equal(boxBodyFn().text().trim().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Accordion: Box 3: 'hide' to 'show' to 'hide'", function (assert) {
-  let $box = jQueryFrameFn("#page\\:mainForm\\:accordionBox3");
-  let $showBox = jQueryFrameFn("#page\\:mainForm\\:showBox3");
-  let $hideBox = jQueryFrameFn("#page\\:mainForm\\:hideBox3");
+  let boxFn = jQueryFrameFn("#page\\:mainForm\\:accordionBox3");
+  let showBoxFn = jQueryFrameFn("#page\\:mainForm\\:showBox3");
+  let hideBoxFn = jQueryFrameFn("#page\\:mainForm\\:hideBox3");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(3, function () {
-    assert.ok($box().hasClass("tobago-collapsed"));
-    assert.equal($showBox().length, 1);
-    assert.equal($hideBox().length, 0);
+    assert.ok(boxFn().hasClass("tobago-collapsed"));
+    assert.equal(showBoxFn().length, 1);
+    assert.equal(hideBoxFn().length, 0);
   });
   TTT.action(function () {
-    $showBox().click();
+    showBoxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.notOk($box().hasClass("tobago-collapsed"));
-    assert.equal($showBox().length, 0);
-    assert.equal($hideBox().length, 1);
+    assert.notOk(boxFn().hasClass("tobago-collapsed"));
+    assert.equal(showBoxFn().length, 0);
+    assert.equal(hideBoxFn().length, 1);
   });
   TTT.action(function () {
-    $hideBox().click();
+    hideBoxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.ok($box().hasClass("tobago-collapsed"));
-    assert.equal($showBox().length, 1);
-    assert.equal($hideBox().length, 0);
+    assert.ok(boxFn().hasClass("tobago-collapsed"));
+    assert.equal(showBoxFn().length, 1);
+    assert.equal(hideBoxFn().length, 0);
   });
   TTT.startTest();
 });
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 c576e90..24a116d 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,239 +18,239 @@
 QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
   assert.expect(3);
 
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  let popupFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
+  let openButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
+  let cancelButtonFn = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
 
-  assert.equal($popup().attr("value"), "true");
-  $openButton().click();
-  assert.equal($popup().attr("value"), "false");
-  $cancelButton().click();
-  assert.equal($popup().attr("value"), "true");
+  assert.equal(popupFn().attr("value"), "true");
+  openButtonFn().click();
+  assert.equal(popupFn().attr("value"), "false");
+  cancelButtonFn().click();
+  assert.equal(popupFn().attr("value"), "true");
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Cancel'.", function (assert) {
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
-  let $messages = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
-  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
-  let $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
-  let outputValue = $output().text();
+  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();
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "true");
+    assert.equal(popupFn().attr("value"), "true");
   });
   TTT.action(function () {
-    $openButton().click();
+    openButtonFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "false");
+    assert.equal(popupFn().attr("value"), "false");
   });
   TTT.action(function () {
-    $inputField().val("");
-    $submitButton().click();
+    inputFieldFn().val("");
+    submitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.action(function () {
-    $cancelButton().click();
+    cancelButtonFn().click();
   });
   TTT.asserts(2, function () {
-    assert.equal($popup().attr("value"), "true");
-    assert.equal($output().text(), outputValue);
+    assert.equal(popupFn().attr("value"), "true");
+    assert.equal(outputFn().text(), outputValue);
   });
   TTT.startTest();
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press 'Cancel'.", function (assert) {
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
-  let $messages = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
-  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
-  let $cancelButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "true");
+    assert.equal(popupFn().attr("value"), "true");
   });
   TTT.action(function () {
-    $openButton().click();
+    openButtonFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "false");
+    assert.equal(popupFn().attr("value"), "false");
   });
   TTT.action(function () {
-    $inputField().val("test client popup - submit button");
-    $submitButton().click();
+    inputFieldFn().val("test client popup - submit button");
+    submitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.action(function () {
-    $cancelButton().click();
+    cancelButtonFn().click();
   });
   TTT.asserts(2, function () {
-    assert.equal($popup().attr("value"), "true");
-    assert.equal($output().text(), "test client popup - submit button");
+    assert.equal(popupFn().attr("value"), "true");
+    assert.equal(outputFn().text(), "test client popup - submit button");
   });
   TTT.startTest();
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.", function (assert) {
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:output span");
-  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let $submitCloseButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
-  let outputValue = $output().text();
+  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();
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "true");
+    assert.equal(popupFn().attr("value"), "true");
   });
   TTT.action(function () {
-    $openButton().click();
+    openButtonFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "false");
+    assert.equal(popupFn().attr("value"), "false");
   });
   TTT.action(function () {
-    $inputField().val("");
-    $submitCloseButton().click();
+    inputFieldFn().val("");
+    submitCloseButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($popup().attr("value"), "true");
-    assert.equal($output().text(), outputValue);
+    assert.equal(popupFn().attr("value"), "true");
+    assert.equal(outputFn().text(), outputValue);
   });
   TTT.startTest();
 });
 
 QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.", function (assert) {
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup input");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:open");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:form2\\:out span");
-  let $inputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
-  let $submitCloseButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "true");
+    assert.equal(popupFn().attr("value"), "true");
   });
   TTT.action(function () {
-    $openButton().click();
+    openButtonFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popup().attr("value"), "false");
+    assert.equal(popupFn().attr("value"), "false");
   });
   TTT.action(function () {
-    $inputField().val("test client popup - submit and close button");
-    $submitCloseButton().click();
+    inputFieldFn().val("test client popup - submit and close button");
+    submitCloseButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($popup().attr("value"), "true");
-    assert.equal($output().text(), "test client popup - submit and close button");
+    assert.equal(popupFn().attr("value"), "true");
+    assert.equal(outputFn().text(), "test client popup - submit and close button");
   });
   TTT.startTest();
 });
 
 QUnit.test("Open 'Large Popup'.", function (assert) {
-  let $dropdownContainer = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
-  let $dropdownButton = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:largePopupLink");
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:largePopup");
-  let $closeButton = jQueryFrameFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    if ($popup().hasClass("show")) {
-      $closeButton().click();
+    if (popupFn().hasClass("show")) {
+      closeButtonFn().click();
     }
-    if ($dropdownContainer().hasClass("show")) {
-      $dropdownButton().click();
+    if (dropdownContainerFn().hasClass("show")) {
+      dropdownButtonFn().click();
     }
   });
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), false);
-    assert.equal($popup().hasClass("show"), false);
+    assert.equal(dropdownContainerFn().hasClass("show"), false);
+    assert.equal(popupFn().hasClass("show"), false);
   });
   TTT.action(function () {
-    $dropdownButton().click();
+    dropdownButtonFn().click();
   });
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), true);
-    assert.equal($popup().hasClass("show"), false);
+    assert.equal(dropdownContainerFn().hasClass("show"), true);
+    assert.equal(popupFn().hasClass("show"), false);
   });
   TTT.action(function () {
-    $openButton().click();
+    openButtonFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), false);
-    assert.equal($popup().hasClass("show"), true);
+    assert.equal(dropdownContainerFn().hasClass("show"), false);
+    assert.equal(popupFn().hasClass("show"), true);
   });
   TTT.action(function () {
-    $closeButton().click();
+    closeButtonFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), false);
-    assert.equal($popup().hasClass("show"), false);
+    assert.equal(dropdownContainerFn().hasClass("show"), false);
+    assert.equal(popupFn().hasClass("show"), false);
   });
   TTT.startTest();
 });
 
 QUnit.test("Open 'Small Popup'.", function (assert) {
-  let $dropdownContainer = jQueryFrameFn("#page\\:mainForm\\:dropdownButton");
-  let $dropdownButton = jQueryFrameFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
-  let $openButton = jQueryFrameFn("#page\\:mainForm\\:smallPopupLink");
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:smallPopup");
-  let $closeButton = jQueryFrameFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    if ($popup().hasClass("show")) {
-      $closeButton().click();
+    if (popupFn().hasClass("show")) {
+      closeButtonFn().click();
     }
-    if ($dropdownContainer().hasClass("show")) {
-      $dropdownButton().click();
+    if (dropdownContainerFn().hasClass("show")) {
+      dropdownButtonFn().click();
     }
   });
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), false);
-    assert.equal($popup().hasClass("show"), false);
+    assert.equal(dropdownContainerFn().hasClass("show"), false);
+    assert.equal(popupFn().hasClass("show"), false);
   });
   TTT.action(function () {
-    $dropdownButton().click();
+    dropdownButtonFn().click();
   });
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), true);
-    assert.equal($popup().hasClass("show"), false);
+    assert.equal(dropdownContainerFn().hasClass("show"), true);
+    assert.equal(popupFn().hasClass("show"), false);
   });
   TTT.action(function () {
-    $openButton().click();
+    openButtonFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), false);
-    assert.equal($popup().hasClass("show"), true);
+    assert.equal(dropdownContainerFn().hasClass("show"), false);
+    assert.equal(popupFn().hasClass("show"), true);
   });
   TTT.action(function () {
-    $closeButton().click();
+    closeButtonFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.equal($dropdownContainer().hasClass("show"), false);
-    assert.equal($popup().hasClass("show"), false);
+    assert.equal(dropdownContainerFn().hasClass("show"), false);
+    assert.equal(popupFn().hasClass("show"), false);
   });
   TTT.startTest();
 });
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 ba9d264..58aa328 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,84 +16,84 @@
  */
 
 QUnit.test("Client: Select Tab 3", function (assert) {
-  let $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupClient\\:\\:activeIndex");
-  let $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1Client");
-  let $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3Client");
-  let $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3Client .nav-link");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(5, function () {
-    assert.equal($hiddenInput().val(), 0);
-    assert.ok($tab1().hasClass("tobago-tab-markup-selected"));
-    assert.notOk($tab3().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab1().hasClass("tobago-tab-markup-one"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-three"));
+    assert.equal(hiddenInputFn().val(), 0);
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-selected"));
+    assert.notOk(tab3Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-one"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-three"));
   });
   TTT.action(function () {
-    $tab3link().click();
+    tab3linkFn().click();
   });
   TTT.asserts(5, function () {
-    assert.equal($hiddenInput().val(), 3);
-    assert.notOk($tab1().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab1().hasClass("tobago-tab-markup-one"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-three"));
+    assert.equal(hiddenInputFn().val(), 3);
+    assert.notOk(tab1Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-one"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-three"));
   });
   TTT.startTest();
 });
 
 QUnit.test("Ajax: Select Tab 3", function (assert) {
-  let $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupAjax\\:\\:activeIndex");
-  let $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1Ajax");
-  let $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax");
-  let $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3Ajax .nav-link");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(5, function () {
-    assert.equal($hiddenInput().val(), 0);
-    assert.ok($tab1().hasClass("tobago-tab-markup-selected"));
-    assert.notOk($tab3().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab1().hasClass("tobago-tab-markup-one"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-three"));
+    assert.equal(hiddenInputFn().val(), 0);
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-selected"));
+    assert.notOk(tab3Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-one"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-three"));
   });
   TTT.action(function () {
-    $tab3link().click();
+    tab3linkFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal($hiddenInput().val(), 3);
-    assert.notOk($tab1().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab1().hasClass("tobago-tab-markup-one"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-three"));
+    assert.equal(hiddenInputFn().val(), 3);
+    assert.notOk(tab1Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-one"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-three"));
   });
   TTT.startTest();
 });
 
 QUnit.test("FullReload: Select Tab 3", function (assert) {
-  let $hiddenInput = jQueryFrameFn("#page\\:mainForm\\:tabGroupFullReload\\:\\:activeIndex");
-  let $tab1 = jQueryFrameFn("#page\\:mainForm\\:tab1FullReload");
-  let $tab3 = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload");
-  let $tab3link = jQueryFrameFn("#page\\:mainForm\\:tab3FullReload .nav-link");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(5, function () {
-    assert.equal($hiddenInput().val(), 0);
-    assert.ok($tab1().hasClass("tobago-tab-markup-selected"));
-    assert.notOk($tab3().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab1().hasClass("tobago-tab-markup-one"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-three"));
+    assert.equal(hiddenInputFn().val(), 0);
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-selected"));
+    assert.notOk(tab3Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-one"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-three"));
   });
   TTT.action(function () {
-    $tab3link().click();
+    tab3linkFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal($hiddenInput().val(), 3);
-    assert.notOk($tab1().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-selected"));
-    assert.ok($tab1().hasClass("tobago-tab-markup-one"));
-    assert.ok($tab3().hasClass("tobago-tab-markup-three"));
+    assert.equal(hiddenInputFn().val(), 3);
+    assert.notOk(tab1Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-selected"));
+    assert.ok(tab1Fn().hasClass("tobago-tab-markup-one"));
+    assert.ok(tab3Fn().hasClass("tobago-tab-markup-three"));
   });
   TTT.startTest();
 });
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 c0da5d8..5fa05cd 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,50 +16,50 @@
  */
 
 QUnit.test("Basics: Name", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let 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 TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("22").trigger("blur");
+    leftPagingFn().val("22").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Earth", "365.26", "",
         "Elara", "259.65", "1905",
         "Enceladus", "1.37", "1789",
         "Epimetheus", "0.69", "1980");
   });
   TTT.action(function () {
-    $colName().click();
+    colNameFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Proteus", "1.12", "1989",
         "Prospero", "-1962.95", "1999",
         "Prometheus", "0.61", "1980",
         "Praxidike", "625.3", "2000");
   });
   TTT.action(function () {
-    $colName().click();
+    colNameFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Earth", "365.26", "",
         "Elara", "259.65", "1905",
         "Enceladus", "1.37", "1789",
@@ -69,50 +69,50 @@ QUnit.test("Basics: Name", function (assert) {
 });
 
 QUnit.test("Basics: Period", function (assert) {
-  let $colPeriod = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnPeriod_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colPeriod().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colPeriodFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colPeriod().click();
+      colPeriodFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colPeriod().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colPeriod().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colPeriod().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colPeriodFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("29").trigger("blur");
+    leftPagingFn().val("29").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Rosalind", "0.56", "1986",
         "Pan", "0.58", "1990",
         "Atlas", "0.6", "1980",
         "Prometheus", "0.61", "1980");
   });
   TTT.action(function () {
-    $colPeriod().click();
+    colPeriodFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Callisto", "16.69", "1610",
         "Titan", "15.95", "1655",
         "Oberon", "13.46", "1787",
         "Titania", "8.71", "1787");
   });
   TTT.action(function () {
-    $colPeriod().click();
+    colPeriodFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Rosalind", "0.56", "1986",
         "Pan", "0.58", "1990",
         "Atlas", "0.6", "1980",
@@ -122,51 +122,51 @@ QUnit.test("Basics: Period", function (assert) {
 });
 
 QUnit.test("Basics: Year", function (assert) {
-  let $colYear = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnDiscoverYear_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colYear().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colYearFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colYear().click();
+      colYearFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colYear().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colYear().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colYear().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colYearFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("22").trigger("blur");
+    leftPagingFn().val("22").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
-    assert.equal($rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
-    assert.equal($rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
-    assert.equal($rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
+    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
   });
   TTT.action(function () {
-    $colYear().click();
+    colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
-    assert.equal($rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
-    assert.equal($rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
-    assert.equal($rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
+    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
+    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
+    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
+    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
   });
   TTT.action(function () {
-    $colYear().click();
+    colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
-    assert.equal($rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
-    assert.equal($rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
-    assert.equal($rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
+    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
   });
   TTT.startTest();
 });
@@ -176,39 +176,39 @@ QUnit.test("Basics: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Basics: left paging", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
+  let 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 TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("8").trigger("blur");
+    leftPagingFn().val("8").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Bianca", "0.43", "1986",
         "Caliban", "-579.39", "1997",
         "Callirrhoe", "758.8", "2000",
         "Callisto", "16.69", "1610");
   });
   TTT.action(function () {
-    $leftPaging().val("9").trigger("blur");
+    leftPagingFn().val("9").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Caliban", "-579.39", "1997",
         "Callirrhoe", "758.8", "2000",
         "Callisto", "16.69", "1610",
@@ -223,62 +223,62 @@ QUnit.test("Basics: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Basics: center paging", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  let $centerPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-center li .page-link");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("1").trigger("blur");
+    leftPagingFn().val("1").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "1986U10", "0.64", "1999",
         "Adrastea", "0.3", "1979",
         "Amalthea", "0.5", "1892",
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    $centerPaging().eq(6).click();
+    centerPagingFn().eq(6).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Epimetheus", "0.69", "1980",
         "Erinome", "728.3", "2000",
         "Europa", "3.55", "1610",
         "Galatea", "0.43", "1989");
   });
   TTT.action(function () {
-    $centerPaging().eq(10).click();
+    centerPagingFn().eq(10).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Phoebe", "-550.48", "1898",
         "Pluto", "90800.0", "1930",
         "Portia", "0.51", "1986",
         "Praxidike", "625.3", "2000");
   });
   TTT.action(function () {
-    $centerPaging().eq(3).click();
+    centerPagingFn().eq(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Neptune", "60190.0", "1846",
         "Nereid", "360.13", "1949",
         "Oberon", "13.46", "1787",
@@ -295,85 +295,85 @@ QUnit.test("Basics: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Basics: right paging", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s1\\:columnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-left input");
-  let $rightPaging = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link");
-  let $jumpToPage = jQueryFrameFn("#page\\:mainForm\\:s1 .tobago-sheet-paging-markup-right .page-link input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("22").trigger("blur");
+    leftPagingFn().val("22").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Earth", "365.26", "",
         "Elara", "259.65", "1905",
         "Enceladus", "1.37", "1789",
         "Epimetheus", "0.69", "1980");
   });
   TTT.action(function () {
-    $rightPaging().eq(0).click();
+    rightPagingFn().eq(0).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "1986U10", "0.64", "1999",
         "Adrastea", "0.3", "1979",
         "Amalthea", "0.5", "1892",
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    $rightPaging().eq(3).click();
+    rightPagingFn().eq(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Ariel", "2.52", "1851",
         "Atlas", "0.6", "1980",
         "Belinda", "0.62", "1986",
         "Bianca", "0.43", "1986");
   });
   TTT.action(function () {
-    $rightPaging().eq(4).click();
+    rightPagingFn().eq(4).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Triton", "-5.88", "1846",
         "Umbriel", "4.14", "1851",
         "Uranus", "30685.0", "1781",
         "Venus", "224.7", "");
   });
   TTT.action(function () {
-    $rightPaging().eq(1).click();
+    rightPagingFn().eq(1).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Thebe", "0.67", "1979",
         "Themisto", "130.02", "2000",
         "Titan", "15.95", "1655",
         "Titania", "8.71", "1787");
   });
   TTT.action(function () {
-    $jumpToPage().val("14").trigger("blur");
+    jumpToPageFn().val("14").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Neptune", "60190.0", "1846",
         "Nereid", "360.13", "1949",
         "Oberon", "13.46", "1787",
@@ -383,50 +383,50 @@ QUnit.test("Basics: right paging", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Name", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let 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 TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("22").trigger("blur");
+    leftPagingFn().val("22").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Earth", "365.26", "",
         "Elara", "259.65", "1905",
         "Enceladus", "1.37", "1789",
         "Epimetheus", "0.69", "1980");
   });
   TTT.action(function () {
-    $colName().click();
+    colNameFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Proteus", "1.12", "1989",
         "Prospero", "-1962.95", "1999",
         "Prometheus", "0.61", "1980",
         "Praxidike", "625.3", "2000");
   });
   TTT.action(function () {
-    $colName().click();
+    colNameFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Earth", "365.26", "",
         "Elara", "259.65", "1905",
         "Enceladus", "1.37", "1789",
@@ -436,50 +436,50 @@ QUnit.test("Custom Sorting: Name", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Period", function (assert) {
-  let $colPeriod = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnPeriod_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colPeriod().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colPeriodFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colPeriod().click();
+      colPeriodFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colPeriod().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colPeriod().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colPeriod().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colPeriodFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colPeriodFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("29").trigger("blur");
+    leftPagingFn().val("29").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Mimas", "0.94", "1789",
         "Proteus", "1.12", "1989",
         "Deimos", "1.26", "1877",
         "Enceladus", "1.37", "1789");
   });
   TTT.action(function () {
-    $colPeriod().click();
+    colPeriodFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Elara", "259.65", "1905",
         "Lysithea", "259.22", "1938",
         "Himalia", "250.57", "1904",
         "Leda", "238.72", "1974");
   });
   TTT.action(function () {
-    $colPeriod().click();
+    colPeriodFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Mimas", "0.94", "1789",
         "Proteus", "1.12", "1989",
         "Deimos", "1.26", "1877",
@@ -489,51 +489,51 @@ QUnit.test("Custom Sorting: Period", function (assert) {
 });
 
 QUnit.test("Custom Sorting: Year", function (assert) {
-  let $colYear = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnYear_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colYear().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colYearFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colYear().click();
+      colYearFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colYear().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colYear().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colYear().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colYearFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colYearFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("22").trigger("blur");
+    leftPagingFn().val("22").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
-    assert.equal($rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
-    assert.equal($rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
-    assert.equal($rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
+    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
   });
   TTT.action(function () {
-    $colYear().click();
+    colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
-    assert.equal($rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
-    assert.equal($rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
-    assert.equal($rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
+    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row0col2");
+    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row1col2");
+    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1989", "row2col2");
+    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1986", "row3col2");
   });
   TTT.action(function () {
-    $colYear().click();
+    colYearFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
-    assert.equal($rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
-    assert.equal($rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
-    assert.equal($rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
+    assert.equal(rowsFn().eq(0).find(".tobago-sheet-cell").eq(2).text().trim(), "1789", "row0col2");
+    assert.equal(rowsFn().eq(1).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row1col2");
+    assert.equal(rowsFn().eq(2).find(".tobago-sheet-cell").eq(2).text().trim(), "1846", "row2col2");
+    assert.equal(rowsFn().eq(3).find(".tobago-sheet-cell").eq(2).text().trim(), "1848", "row3col2");
   });
   TTT.startTest();
 });
@@ -543,39 +543,39 @@ QUnit.test("Custom Sorting: Year", function (assert) {
  * 2. goto line 9
  */
 QUnit.test("Custom Sorting: left paging", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
+  let 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 TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("8").trigger("blur");
+    leftPagingFn().val("8").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Bianca", "0.43", "1986",
         "Caliban", "-579.39", "1997",
         "Callirrhoe", "758.8", "2000",
         "Callisto", "16.69", "1610");
   });
   TTT.action(function () {
-    $leftPaging().val("9").trigger("blur");
+    leftPagingFn().val("9").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Caliban", "-579.39", "1997",
         "Callirrhoe", "758.8", "2000",
         "Callisto", "16.69", "1610",
@@ -590,62 +590,62 @@ QUnit.test("Custom Sorting: left paging", function (assert) {
  * 3. goto page 13
  */
 QUnit.test("Custom Sorting: center paging", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  let $centerPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-center li .page-link");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("1").trigger("blur");
+    leftPagingFn().val("1").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "1986U10", "0.64", "1999",
         "Adrastea", "0.3", "1979",
         "Amalthea", "0.5", "1892",
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    $centerPaging().eq(6).click();
+    centerPagingFn().eq(6).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Epimetheus", "0.69", "1980",
         "Erinome", "728.3", "2000",
         "Europa", "3.55", "1610",
         "Galatea", "0.43", "1989");
   });
   TTT.action(function () {
-    $centerPaging().eq(10).click();
+    centerPagingFn().eq(10).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Phoebe", "-550.48", "1898",
         "Pluto", "90800.0", "1930",
         "Portia", "0.51", "1986",
         "Praxidike", "625.3", "2000");
   });
   TTT.action(function () {
-    $centerPaging().eq(3).click();
+    centerPagingFn().eq(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Neptune", "60190.0", "1846",
         "Nereid", "360.13", "1949",
         "Oberon", "13.46", "1787",
@@ -662,84 +662,84 @@ QUnit.test("Custom Sorting: center paging", function (assert) {
  * 5. goto page 14
  */
 QUnit.test("Custom Sorting: right paging", function (assert) {
-  let $colName = jQueryFrameFn("#page\\:mainForm\\:s2\\:customColumnName_sorter");
-  let $rows = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-bodyTable tbody .tobago-sheet-row");
-  let $leftPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-left input");
-  let $rightPaging = jQueryFrameFn("#page\\:mainForm\\:s2 .tobago-sheet-paging-markup-right .page-link");
+  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");
 
   let TTT = new TobagoTestTools(assert);
-  if (!$colName().hasClass("tobago-sheet-header-markup-ascending")) {
+  if (!colNameFn().hasClass("tobago-sheet-header-markup-ascending")) {
     TTT.action(function () {
-      $colName().click();
+      colNameFn().click();
     });
     TTT.waitForResponse();
   }
   TTT.asserts(3, function () {
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-sortable"));
-    assert.ok($colName().hasClass("tobago-sheet-header-markup-ascending"));
-    assert.notOk($colName().hasClass("tobago-sheet-header-markup-descending"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-sortable"));
+    assert.ok(colNameFn().hasClass("tobago-sheet-header-markup-ascending"));
+    assert.notOk(colNameFn().hasClass("tobago-sheet-header-markup-descending"));
   });
   TTT.action(function () {
-    $leftPaging().val("22").trigger("blur");
+    leftPagingFn().val("22").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Earth", "365.26", "",
         "Elara", "259.65", "1905",
         "Enceladus", "1.37", "1789",
         "Epimetheus", "0.69", "1980");
   });
   TTT.action(function () {
-    $rightPaging().eq(0).click();
+    rightPagingFn().eq(0).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "1986U10", "0.64", "1999",
         "Adrastea", "0.3", "1979",
         "Amalthea", "0.5", "1892",
         "Ananke", "-629.77", "1951");
   });
   TTT.action(function () {
-    $rightPaging().eq(3).click();
+    rightPagingFn().eq(3).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Ariel", "2.52", "1851",
         "Atlas", "0.6", "1980",
         "Belinda", "0.62", "1986",
         "Bianca", "0.43", "1986");
   });
   TTT.action(function () {
-    $rightPaging().eq(4).click();
+    rightPagingFn().eq(4).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Triton", "-5.88", "1846",
         "Umbriel", "4.14", "1851",
         "Uranus", "30685.0", "1781",
         "Venus", "224.7", "");
   });
   TTT.action(function () {
-    $rightPaging().eq(1).click();
+    rightPagingFn().eq(1).click();
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Thebe", "0.67", "1979",
         "Themisto", "130.02", "2000",
         "Titan", "15.95", "1655",
         "Titania", "8.71", "1787");
   });
   TTT.action(function () {
-    $rightPaging().find("input").val("14").trigger("blur");
+    rightPagingFn().find("input").val("14").trigger("blur");
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    ajaxExecuteBodyTableCheck(assert, $rows,
+    ajaxExecuteBodyTableCheck(assert, rowsFn,
         "Neptune", "60190.0", "1846",
         "Nereid", "360.13", "1949",
         "Oberon", "13.46", "1787",
@@ -748,20 +748,20 @@ QUnit.test("Custom Sorting: right paging", function (assert) {
   TTT.startTest();
 });
 
-function ajaxExecuteBodyTableCheck(assert, $rows, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
+function ajaxExecuteBodyTableCheck(assert, rowsFn, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
                                    row2col0, row2col1, row2col2, row3col0, row3col1, row3col2) {
-  let $row0Col0 = $rows().eq(0).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row0Col1 = $rows().eq(0).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row0Col2 = $rows().eq(0).find(".tobago-sheet-cell").eq(2).text().trim();
-  let $row1Col0 = $rows().eq(1).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row1Col1 = $rows().eq(1).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row1Col2 = $rows().eq(1).find(".tobago-sheet-cell").eq(2).text().trim();
-  let $row2Col0 = $rows().eq(2).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row2Col1 = $rows().eq(2).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row2Col2 = $rows().eq(2).find(".tobago-sheet-cell").eq(2).text().trim();
-  let $row3Col0 = $rows().eq(3).find(".tobago-sheet-cell").eq(0).text().trim();
-  let $row3Col1 = $rows().eq(3).find(".tobago-sheet-cell").eq(1).text().trim();
-  let $row3Col2 = $rows().eq(3).find(".tobago-sheet-cell").eq(2).text().trim();
+  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();
 
   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 d538b8a..92036a0 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,194 +16,194 @@
  */
 
 QUnit.test("On click with ajax", function (assert) {
-  let $oneClickAjax = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:0");
-  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample0");
-  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample0");
-  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample0");
-  let $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $oneClickAjax().click();
+    oneClickAjaxFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($venus().length, 1);
-    assert.equal($jupiter().length, 1);
-    assert.equal($saturn().length, 1);
+    assert.equal(venusFn().length, 1);
+    assert.equal(jupiterFn().length, 1);
+    assert.equal(saturnFn().length, 1);
   });
   TTT.action(function () {
-    $venus().click();
+    venusFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Venus");
+    assert.equal(namefieldFn().val(), "Venus");
   });
   TTT.action(function () {
-    $jupiter().click();
+    jupiterFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Jupiter");
+    assert.equal(namefieldFn().val(), "Jupiter");
   });
   TTT.action(function () {
-    $saturn().click();
+    saturnFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Saturn");
+    assert.equal(namefieldFn().val(), "Saturn");
   });
   TTT.startTest();
 });
 
 QUnit.test("On click with full request", function (assert) {
-  let $oneClickFullRequest = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:1");
-  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample1");
-  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample1");
-  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample1");
-  let $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $oneClickFullRequest().click();
+    oneClickFullRequestFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($venus().length, 1);
-    assert.equal($jupiter().length, 1);
-    assert.equal($saturn().length, 1);
+    assert.equal(venusFn().length, 1);
+    assert.equal(jupiterFn().length, 1);
+    assert.equal(saturnFn().length, 1);
   });
   TTT.action(function () {
-    $venus().click();
+    venusFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Venus");
+    assert.equal(namefieldFn().val(), "Venus");
   });
   TTT.action(function () {
-    $jupiter().click();
+    jupiterFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Jupiter");
+    assert.equal(namefieldFn().val(), "Jupiter");
   });
   TTT.action(function () {
-    $saturn().click();
+    saturnFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Saturn");
+    assert.equal(namefieldFn().val(), "Saturn");
   });
   TTT.startTest();
 });
 
 QUnit.test("On double click with full request", function (assert) {
-  let $doubleClickFullRequest = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:2");
-  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample2");
-  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample2");
-  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample2");
-  let $namefield = jQueryFrameFn("#page\\:mainForm\\:name\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $doubleClickFullRequest().click();
+    doubleClickFullRequestFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($venus().length, 1);
-    assert.equal($jupiter().length, 1);
-    assert.equal($saturn().length, 1);
+    assert.equal(venusFn().length, 1);
+    assert.equal(jupiterFn().length, 1);
+    assert.equal(saturnFn().length, 1);
   });
   TTT.action(function () {
-    $venus().dblclick();
+    venusFn().dblclick();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Venus");
+    assert.equal(namefieldFn().val(), "Venus");
   });
   TTT.action(function () {
-    $jupiter().dblclick();
+    jupiterFn().dblclick();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Jupiter");
+    assert.equal(namefieldFn().val(), "Jupiter");
   });
   TTT.action(function () {
-    $saturn().dblclick();
+    saturnFn().dblclick();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($namefield().val(), "Saturn");
+    assert.equal(namefieldFn().val(), "Saturn");
   });
   TTT.startTest();
 });
 
 QUnit.test("Open popup on click with ajax", function (assert) {
-  let $radioButton = jQueryFrameFn("#page\\:mainForm\\:changeExample\\:\\:3");
-  let $venus = jQueryFrameFn("#page\\:mainForm\\:s1\\:2\\:sample3");
-  let $jupiter = jQueryFrameFn("#page\\:mainForm\\:s1\\:5\\:sample3");
-  let $saturn = jQueryFrameFn("#page\\:mainForm\\:s1\\:6\\:sample3");
-  let $popup = jQueryFrameFn("#page\\:mainForm\\:popup");
-  let $name = jQueryFrameFn("#page\\:mainForm\\:popup\\:popupName\\:\\:field");
-  let $cancel = jQueryFrameFn("#page\\:mainForm\\:popup\\:cancel");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $radioButton().click();
+    radioButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($venus().length, 1);
-    assert.equal($jupiter().length, 1);
-    assert.equal($saturn().length, 1);
+    assert.equal(venusFn().length, 1);
+    assert.equal(jupiterFn().length, 1);
+    assert.equal(saturnFn().length, 1);
   });
   TTT.action(function () {
-    $venus().click();
+    venusFn().click();
   });
   TTT.waitForResponse();
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.ok($popup().hasClass("show"));
-    assert.equal($name().val(), "Venus");
+    assert.ok(popupFn().hasClass("show"));
+    assert.equal(nameFn().val(), "Venus");
   });
   TTT.action(function () {
-    $cancel().click();
+    cancelFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(1, function () {
-    assert.notOk($popup().hasClass("show"));
+    assert.notOk(popupFn().hasClass("show"));
   });
   TTT.action(function () {
-    $jupiter().click();
+    jupiterFn().click();
   });
   TTT.waitForResponse();
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.ok($popup().hasClass("show"));
-    assert.equal($name().val(), "Jupiter");
+    assert.ok(popupFn().hasClass("show"));
+    assert.equal(nameFn().val(), "Jupiter");
   });
   TTT.action(function () {
-    $cancel().click();
+    cancelFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(1, function () {
-    assert.notOk($popup().hasClass("show"));
+    assert.notOk(popupFn().hasClass("show"));
   });
   TTT.action(function () {
-    $saturn().click();
+    saturnFn().click();
   });
   TTT.waitForResponse();
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(2, function () {
-    assert.ok($popup().hasClass("show"));
-    assert.equal($name().val(), "Saturn");
+    assert.ok(popupFn().hasClass("show"));
+    assert.equal(nameFn().val(), "Saturn");
   });
   TTT.action(function () {
-    $cancel().click();
+    cancelFn().click();
   });
   TTT.waitMs(1000); // wait for animation
   TTT.asserts(1, function () {
-    assert.notOk($popup().hasClass("show"));
+    assert.notOk(popupFn().hasClass("show"));
   });
   TTT.startTest();
 });
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 a63b0d2..b4b2a2a 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,224 +16,224 @@
  */
 
 QUnit.test("single: select Music, select Mathematics", function (assert) {
-  let $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let $selectableSingle = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:1");
-  let $input = jQueryFrameFn(".tobago-treeSelect input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectableNone().prop("checked", true).trigger("change");
+    selectableNoneFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($input().length, 0);
+    assert.equal(inputFn().length, 0);
   });
   TTT.action(function () {
-    $selectableSingle().prop("checked", true).trigger("change");
+    selectableSingleFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.notEqual($input().length, 0);
+    assert.notEqual(inputFn().length, 0);
   });
   TTT.action(function () {
-    $music().prop("checked", true).trigger("change");
+    musicFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Music");
+    assert.equal(outputFn().text(), "Music");
   });
   TTT.action(function () {
-    $mathematics().prop("checked", true).trigger("change");
+    mathematicsFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Mathematics");
+    assert.equal(outputFn().text(), "Mathematics");
   });
   TTT.startTest();
 });
 
 QUnit.test("singleLeafOnly: select Classic, select Mathematics", function (assert) {
-  let $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let $selectableSingleLeafOnly = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:2");
-  let $input = jQueryFrameFn(".tobago-treeSelect input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectableNone().prop("checked", true).trigger("change");
+    selectableNoneFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($input().length, 0);
+    assert.equal(inputFn().length, 0);
   });
   TTT.action(function () {
-    $selectableSingleLeafOnly().prop("checked", true).trigger("change");
+    selectableSingleLeafOnlyFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.notEqual($input().length, 0);
+    assert.notEqual(inputFn().length, 0);
   });
   TTT.action(function () {
-    $classic().prop("checked", true).trigger("change");
+    classicFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Classic");
+    assert.equal(outputFn().text(), "Classic");
   });
   TTT.action(function () {
-    $mathematics().prop("checked", true).trigger("change");
+    mathematicsFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Mathematics");
+    assert.equal(outputFn().text(), "Mathematics");
   });
   TTT.startTest();
 });
 
 QUnit.test("multi: select Music, select Mathematics, deselect Music", function (assert) {
-  let $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let $selectableMulti = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:3");
-  let $input = jQueryFrameFn(".tobago-treeSelect input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectableNone().prop("checked", true).trigger("change");
+    selectableNoneFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($input().length, 0);
+    assert.equal(inputFn().length, 0);
   });
   TTT.action(function () {
-    $selectableMulti().prop("checked", true).trigger("change");
+    selectableMultiFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.notEqual($input().length, 0);
+    assert.notEqual(inputFn().length, 0);
   });
   TTT.action(function () {
-    $music().prop("checked", true).trigger("change");
+    musicFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Music");
+    assert.equal(outputFn().text(), "Music");
   });
   TTT.action(function () {
-    $mathematics().prop("checked", true).trigger("change");
+    mathematicsFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Music, Mathematics");
+    assert.equal(outputFn().text(), "Music, Mathematics");
   });
   TTT.action(function () {
-    $music().prop("checked", false).trigger("change");
+    musicFn().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Mathematics");
+    assert.equal(outputFn().text(), "Mathematics");
   });
   TTT.startTest();
 });
 
 QUnit.test("multiLeafOnly: select Classic, select Mathematics, deselect Classic", function (assert) {
-  let $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let $selectableMultiLeafOnly = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:4");
-  let $input = jQueryFrameFn(".tobago-treeSelect input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectableNone().prop("checked", true).trigger("change");
+    selectableNoneFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($input().length, 0);
+    assert.equal(inputFn().length, 0);
   });
   TTT.action(function () {
-    $selectableMultiLeafOnly().prop("checked", true).trigger("change");
+    selectableMultiLeafOnlyFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.notEqual($input().length, 0);
+    assert.notEqual(inputFn().length, 0);
   });
   TTT.action(function () {
-    $classic().prop("checked", true).trigger("change");
+    classicFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Classic");
+    assert.equal(outputFn().text(), "Classic");
   });
   TTT.action(function () {
-    $mathematics().prop("checked", true).trigger("change");
+    mathematicsFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Classic, Mathematics");
+    assert.equal(outputFn().text(), "Classic, Mathematics");
   });
   TTT.action(function () {
-    $classic().prop("checked", false).trigger("change");
+    classicFn().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Mathematics");
+    assert.equal(outputFn().text(), "Mathematics");
   });
   TTT.startTest();
 });
 
 QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", function (assert) {
-  let $music = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
-  let $classic = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
-  let $mathematics = jQueryFrameFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:selectedNodesOutput span");
-  let $selectableNone = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:0");
-  let $selectableMultiCascade = jQueryFrameFn("#page\\:mainForm\\:selectable\\:\\:5");
-  let $input = jQueryFrameFn(".tobago-treeSelect input");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $selectableNone().prop("checked", true).trigger("change");
+    selectableNoneFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($input().length, 0);
+    assert.equal(inputFn().length, 0);
   });
   TTT.action(function () {
-    $selectableMultiCascade().prop("checked", true).trigger("change");
+    selectableMultiCascadeFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.notEqual($input().length, 0);
+    assert.notEqual(inputFn().length, 0);
   });
   TTT.action(function () {
-    $music().prop("checked", true).trigger("change");
+    musicFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse(); // an ajax request is send for every leaf (Music, Classic, Pop, World)
   TTT.waitMs(2000); // wait for the last ajax
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Music, Classic, Pop, World");
+    assert.equal(outputFn().text(), "Music, Classic, Pop, World");
   });
   TTT.action(function () {
-    $mathematics().prop("checked", true).trigger("change");
+    mathematicsFn().prop("checked", true).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Music, Classic, Pop, World, Mathematics");
+    assert.equal(outputFn().text(), "Music, Classic, Pop, World, Mathematics");
   });
   TTT.action(function () {
-    $classic().prop("checked", false).trigger("change");
+    classicFn().prop("checked", false).trigger("change");
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "Music, Pop, World, Mathematics");
+    assert.equal(outputFn().text(), "Music, Pop, World, Mathematics");
   });
   TTT.startTest();
 });
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 d0ba1a2..f023ea9 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,225 +16,225 @@
  */
 
 QUnit.test("Required: Submit without content.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $textarea = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
-  let textareaValue = $textarea().val();
+  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();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $textarea().val("");
-    $submit().click();
+    textareaFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($textarea().val(), textareaValue);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(textareaFn().val(), textareaValue);
   });
   TTT.startTest();
 });
 
 QUnit.test("Required: Submit with content.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $textarea = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
+  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let textareaFn = jQueryFrameFn("#page\\:mainForm\\:required\\:textarea\\:\\:field");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit_r");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $textarea().val("some content");
-    $submit().click();
+    textareaFn().val("some content");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($textarea().val(), "some content");
+    assert.equal(messagesFn().length, 0);
+    assert.equal(textareaFn().val(), "some content");
   });
   TTT.startTest();
 });
 
 QUnit.test("Validate Length: Submit single character.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("a");
-    $submit().click();
+    inFn().val("a");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Validate Length: Submit two character.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:in_vl\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateLength\\:submit_vl");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("ab");
-    $submit().click();
+    inFn().val("ab");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Validate Range: Submit no number.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("no number");
-    $submit().click();
+    inFn().val("no number");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Validate Range: Submit number '2' which is out of range.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("2");
-    $submit().click();
+    inFn().val("2");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Validate Range: Submit number '78' which is out of range.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("78");
-    $submit().click();
+    inFn().val("78");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Validate Range: Submit number '64' which is within the range.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:in_vr\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:validateRange\\:submit_vr");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("64");
-    $submit().click();
+    inFn().val("64");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Regex Validation: Submit 'T' which violates the pattern.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("T");
-    $submit().click();
+    inFn().val("T");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Regex Validation: Submit '3' which violates the pattern.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("3");
-    $submit().click();
+    inFn().val("3");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Regex Validation: Submit 'T3' which is accepted.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:in_rv\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:regexValidation\\:submit_rv");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("T3");
-    $submit().click();
+    inFn().val("T3");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Custom Validator: Submit rejected string.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("java");
-    $submit().click();
+    inFn().val("java");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Custom Validator: Submit accepted string.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:in_cv\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:customValidator\\:submit_cv");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("tobago");
-    $submit().click();
+    inFn().val("tobago");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
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 2d7c792..90d3c81 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,86 +16,86 @@
  */
 
 QUnit.test("Required: Submit without content.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
+  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Required: Submit with content.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
+  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:required\\:in1\\:\\:field");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:required\\:submit1");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("some content");
-    $submit().click();
+    inFn().val("some content");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Length: Submit single character.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("a");
-    $submit().click();
+    inFn().val("a");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Length: Submit three characters.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("abc");
-    $submit().click();
+    inFn().val("abc");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Length: Submit five characters.", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
+  let messagesFn = jQueryFrameFn("#page\\:messages.tobago-messages div");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:length\\:in2\\:\\:field");
+  let submitFn = jQueryFrameFn("#page\\:mainForm\\:length\\:submit2");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val("abcde");
-    $submit().click();
+    inFn().val("abcde");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
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 1fdb668..0a8581d 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,186 +16,186 @@
  */
 
 QUnit.test("submit inner form 1 without violations", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
-  let $form1SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:submit1");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Alice");
-    $form1SubmitButton().click();
+    form1InputFieldFn().val("Alice");
+    form1SubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($form1InputField().val(), "Alice");
-    assert.equal($form1OutputField().text(), "Alice");
-    assert.equal($alert().length, "0");
+    assert.equal(form1InputFieldFn().val(), "Alice");
+    assert.equal(form1OutputFieldFn().text(), "Alice");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit inner form 2, violate required field", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let form2OutputFieldValue = $form2OutputField().text();
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("");
+    form2InputFieldFn().val("");
   });
   TTT.asserts(1, function () {
-    assert.equal($form2InputField().val(), "");
+    assert.equal(form2InputFieldFn().val(), "");
   });
   TTT.action(function () {
-    $form2SubmitButton().click();
+    form2SubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit inner form 2 without violations", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:submit2");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("Bob");
+    form2InputFieldFn().val("Bob");
   });
   TTT.asserts(1, function () {
-    assert.equal($form2InputField().val(), "Bob");
+    assert.equal(form2InputFieldFn().val(), "Bob");
   });
   TTT.action(function () {
-    $form2SubmitButton().click();
+    form2SubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($form2InputField().val(), "Bob");
-    assert.equal($form2OutputField().text(), "Bob");
-    assert.equal($alert().length, "0");
+    assert.equal(form2InputFieldFn().val(), "Bob");
+    assert.equal(form2OutputFieldFn().text(), "Bob");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form, violate both required fields", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("");
-    $outerFormInputField().val("");
-    $outerFormSubmitButton().click();
+    form2InputFieldFn().val("");
+    outerFormInputFieldFn().val("");
+    outerFormSubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "2");
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "2");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form, violate required field in form 2", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("");
-    $outerFormInputField().val("Charlie");
-    $outerFormSubmitButton().click();
+    form2InputFieldFn().val("");
+    outerFormInputFieldFn().val("Charlie");
+    outerFormSubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "Charlie");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "Charlie");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form, violate required field in outer form", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("Dave");
-    $outerFormInputField().val("");
-    $outerFormSubmitButton().click();
+    form2InputFieldFn().val("Dave");
+    outerFormInputFieldFn().val("");
+    outerFormSubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(5, function () {
-    assert.equal($form2InputField().val(), "Dave");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form2InputFieldFn().val(), "Dave");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form without violations", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:in1\\:\\:field");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:in2\\:\\:field");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormSubmitButton = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm1\\:out1 span");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:innerForm2\\:out2 span");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  let 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);
   TTT.action(function () {
-    $form1InputField().val("Eve");
-    $form2InputField().val("Frank");
-    $outerFormInputField().val("Grace");
-    $outerFormSubmitButton().click();
+    form1InputFieldFn().val("Eve");
+    form2InputFieldFn().val("Frank");
+    outerFormInputFieldFn().val("Grace");
+    outerFormSubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Eve");
-    assert.equal($form1OutputField().text(), "Eve");
-    assert.equal($form2InputField().val(), "Frank");
-    assert.equal($form2OutputField().text(), "Frank");
-    assert.equal($outerFormInputField().val(), "Grace");
-    assert.equal($outerFormOutputField().text(), "Grace");
-    assert.equal($alert().length, "0");
+    assert.equal(form1InputFieldFn().val(), "Eve");
+    assert.equal(form1OutputFieldFn().text(), "Eve");
+    assert.equal(form2InputFieldFn().val(), "Frank");
+    assert.equal(form2OutputFieldFn().text(), "Frank");
+    assert.equal(outerFormInputFieldFn().val(), "Grace");
+    assert.equal(outerFormOutputFieldFn().text(), "Grace");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
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 d4fc455..ddda072 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,329 +16,329 @@
  */
 
 QUnit.test("submit inner form 1 without violations", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:submit1");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Alice");
-    $button().click();
+    form1InputFieldFn().val("Alice");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($form1InputField().val(), "Alice");
-    assert.equal($form1OutputField().text(), "Alice");
-    assert.equal($alert().length, "0");
+    assert.equal(form1InputFieldFn().val(), "Alice");
+    assert.equal(form1OutputFieldFn().text(), "Alice");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
 
 
 QUnit.test("submit inner form 2, violate required field", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form2OutputFieldValue = $form2OutputField().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("");
-    $button().click();
+    form2InputFieldFn().val("");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit inner form 2 without violations", function (assert) {
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:submit2");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form2InputField().val("Bob");
-    $button().click();
+    form2InputFieldFn().val("Bob");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($form2InputField().val(), "Bob");
-    assert.equal($form2OutputField().text(), "Bob");
-    assert.equal($alert().length, "0");
+    assert.equal(form2InputFieldFn().val(), "Bob");
+    assert.equal(form2OutputFieldFn().text(), "Bob");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form, violate both required fields", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form1OutputFieldValue = $form1OutputField().text();
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = form1OutputFieldFn().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Charlie");
-    $form2InputField().val("");
-    $outerFormInputField().val("");
-    $button().click();
+    form1InputFieldFn().val("Charlie");
+    form2InputFieldFn().val("");
+    outerFormInputFieldFn().val("");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Charlie");
-    assert.equal($form1OutputField().text(), form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "2");
+    assert.equal(form1InputFieldFn().val(), "Charlie");
+    assert.equal(form1OutputFieldFn().text(), form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "2");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form, violate required field in form 2", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form1OutputFieldValue = $form1OutputField().text();
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = form1OutputFieldFn().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Dave");
-    $form2InputField().val("");
-    $outerFormInputField().val("Eve");
-    $button().click();
+    form1InputFieldFn().val("Dave");
+    form2InputFieldFn().val("");
+    outerFormInputFieldFn().val("Eve");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Dave");
-    assert.equal($form1OutputField().text(), form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "Eve");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form1InputFieldFn().val(), "Dave");
+    assert.equal(form1OutputFieldFn().text(), form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "Eve");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form, violate required field in outer form", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form1OutputFieldValue = $form1OutputField().text();
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = form1OutputFieldFn().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Frank");
-    $form2InputField().val("Grace");
-    $outerFormInputField().val("");
-    $button().click();
+    form1InputFieldFn().val("Frank");
+    form2InputFieldFn().val("Grace");
+    outerFormInputFieldFn().val("");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Frank");
-    assert.equal($form1OutputField().text(), form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "Grace");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form1InputFieldFn().val(), "Frank");
+    assert.equal(form1OutputFieldFn().text(), form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "Grace");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer form without violations", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submit");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Hank");
-    $form2InputField().val("Irene");
-    $outerFormInputField().val("John");
-    $button().click();
+    form1InputFieldFn().val("Hank");
+    form2InputFieldFn().val("Irene");
+    outerFormInputFieldFn().val("John");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Hank");
-    assert.equal($form1OutputField().text(), "Hank");
-    assert.equal($form2InputField().val(), "Irene");
-    assert.equal($form2OutputField().text(), "Irene");
-    assert.equal($outerFormInputField().val(), "John");
-    assert.equal($outerFormOutputField().text(), "John");
-    assert.equal($alert().length, "0");
+    assert.equal(form1InputFieldFn().val(), "Hank");
+    assert.equal(form1OutputFieldFn().text(), "Hank");
+    assert.equal(form2InputFieldFn().val(), "Irene");
+    assert.equal(form2OutputFieldFn().text(), "Irene");
+    assert.equal(outerFormInputFieldFn().val(), "John");
+    assert.equal(outerFormOutputFieldFn().text(), "John");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit inner forms, violate required field in form 2", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form1OutputFieldValue = $form1OutputField().text();
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = form1OutputFieldFn().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Kate");
-    $form2InputField().val("");
-    $outerFormInputField().val("Leonard");
-    $button().click();
+    form1InputFieldFn().val("Kate");
+    form2InputFieldFn().val("");
+    outerFormInputFieldFn().val("Leonard");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Kate");
-    assert.equal($form1OutputField().text(), form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "Leonard");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form1InputFieldFn().val(), "Kate");
+    assert.equal(form1OutputFieldFn().text(), form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "Leonard");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit inner forms without violations", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitInnerForms");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Mike");
-    $form2InputField().val("Neil");
-    $outerFormInputField().val("");
-    $button().click();
+    form1InputFieldFn().val("Mike");
+    form2InputFieldFn().val("Neil");
+    outerFormInputFieldFn().val("");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Mike");
-    assert.equal($form1OutputField().text(), "Mike");
-    assert.equal($form2InputField().val(), "Neil");
-    assert.equal($form2OutputField().text(), "Neil");
-    assert.equal($outerFormInputField().val(), "");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "0");
+    assert.equal(form1InputFieldFn().val(), "Mike");
+    assert.equal(form1OutputFieldFn().text(), "Mike");
+    assert.equal(form2InputFieldFn().val(), "Neil");
+    assert.equal(form2OutputFieldFn().text(), "Neil");
+    assert.equal(outerFormInputFieldFn().val(), "");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer value, violate required field", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form1OutputFieldValue = $form1OutputField().text();
-  let form2OutputFieldValue = $form2OutputField().text();
-  let outerFormOutputFieldValue = $outerFormOutputField().text();
+  let form1OutputFieldValue = form1OutputFieldFn().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
+  let outerFormOutputFieldValue = outerFormOutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Oscar");
-    $form2InputField().val("Penny");
-    $outerFormInputField().val("");
-    $button().click();
+    form1InputFieldFn().val("Oscar");
+    form2InputFieldFn().val("Penny");
+    outerFormInputFieldFn().val("");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Oscar");
-    assert.equal($form1OutputField().text(), form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "Penny");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "");
-    assert.equal($outerFormOutputField().text(), outerFormOutputFieldValue);
-    assert.equal($alert().length, "1");
+    assert.equal(form1InputFieldFn().val(), "Oscar");
+    assert.equal(form1OutputFieldFn().text(), form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "Penny");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "");
+    assert.equal(outerFormOutputFieldFn().text(), outerFormOutputFieldValue);
+    assert.equal(alertFn().length, "1");
   });
   TTT.startTest();
 });
 
 QUnit.test("submit outer value without violations", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:in1\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form1\\:out1 span");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:in2\\:\\:field");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:form2\\:out2 span");
-  let $outerFormInputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:in\\:\\:field");
-  let $outerFormOutputField = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:out span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:outerForm\\:submitOuterValue");
-  let $alert = jQueryFrameFn("#page\\:messages .alert-danger label");
+  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");
 
-  let form1OutputFieldValue = $form1OutputField().text();
-  let form2OutputFieldValue = $form2OutputField().text();
+  let form1OutputFieldValue = form1OutputFieldFn().text();
+  let form2OutputFieldValue = form2OutputFieldFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Quin");
-    $form2InputField().val("Sue");
-    $outerFormInputField().val("Ted");
-    $button().click();
+    form1InputFieldFn().val("Quin");
+    form2InputFieldFn().val("Sue");
+    outerFormInputFieldFn().val("Ted");
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(7, function () {
-    assert.equal($form1InputField().val(), "Quin");
-    assert.equal($form1OutputField().text(), form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "Sue");
-    assert.equal($form2OutputField().text(), form2OutputFieldValue);
-    assert.equal($outerFormInputField().val(), "Ted");
-    assert.equal($outerFormOutputField().text(), "Ted");
-    assert.equal($alert().length, "0");
+    assert.equal(form1InputFieldFn().val(), "Quin");
+    assert.equal(form1OutputFieldFn().text(), form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "Sue");
+    assert.equal(form2OutputFieldFn().text(), form2OutputFieldValue);
+    assert.equal(outerFormInputFieldFn().val(), "Ted");
+    assert.equal(outerFormOutputFieldFn().text(), "Ted");
+    assert.equal(alertFn().length, "0");
   });
   TTT.startTest();
 });
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 a068974..9a0e017 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,49 +16,49 @@
  */
 
 QUnit.test("submit form 1", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
-  let $form1SubmitButton = jQueryFrameFn("#page\\:mainForm\\:form1\\:submit1");
-  let $form2OutputFieldValue = $form2OutputField().text();
+  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();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Oliver");
-    $form2InputField().val("Peter");
-    $form1SubmitButton().click();
+    form1InputFieldFn().val("Oliver");
+    form2InputFieldFn().val("Peter");
+    form1SubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($form1InputField().val(), "Oliver");
-    assert.equal($form1OutputField().text(), "Oliver");
-    assert.equal($form2InputField().val(), "Peter");
-    assert.equal($form2OutputField().text(), $form2OutputFieldValue);
+    assert.equal(form1InputFieldFn().val(), "Oliver");
+    assert.equal(form1OutputFieldFn().text(), "Oliver");
+    assert.equal(form2InputFieldFn().val(), "Peter");
+    assert.equal(form2OutputFieldFn().text(), $form2OutputFieldValue);
   });
   TTT.startTest();
 });
 
 QUnit.test("submit form 2", function (assert) {
-  let $form1InputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:in1\\:\\:field");
-  let $form2InputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:in2\\:\\:field");
-  let $form1OutputField = jQueryFrameFn("#page\\:mainForm\\:form1\\:out1 span");
-  let $form2OutputField = jQueryFrameFn("#page\\:mainForm\\:form2\\:out2 span");
-  let $form2SubmitButton = jQueryFrameFn("#page\\:mainForm\\:form2\\:submit2");
-  let $form1OutputFieldValue = $form1OutputField().text();
+  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();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $form1InputField().val("Oliver");
-    $form2InputField().val("Peter");
-    $form2SubmitButton().click();
+    form1InputFieldFn().val("Oliver");
+    form2InputFieldFn().val("Peter");
+    form2SubmitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($form1InputField().val(), "Oliver");
-    assert.equal($form1OutputField().text(), $form1OutputFieldValue);
-    assert.equal($form2InputField().val(), "Peter");
-    assert.equal($form2OutputField().text(), "Peter");
+    assert.equal(form1InputFieldFn().val(), "Oliver");
+    assert.equal(form1OutputFieldFn().text(), $form1OutputFieldValue);
+    assert.equal(form2InputFieldFn().val(), "Peter");
+    assert.equal(form2OutputFieldFn().text(), "Peter");
   });
   TTT.startTest();
 });
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 d9a95ac..8309871 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,41 +16,41 @@
  */
 
 QUnit.test("Add a river and reset.", function (assert) {
-  let $name = jQueryFrameFn("#page\\:mainForm\\:add\\:inName\\:\\:field");
-  let $length = jQueryFrameFn("#page\\:mainForm\\:add\\:inLength\\:\\:field");
-  let $discharge = jQueryFrameFn("#page\\:mainForm\\:add\\:inDischarge\\:\\:field");
-  let $add = jQueryFrameFn("#page\\:mainForm\\:add\\:buttonAdd");
-  let $reset = jQueryFrameFn("#page\\:mainForm\\:reset\\:buttonReset");
-  let $forEachBoxes = jQueryFrameFn("#page\\:mainForm\\:forEach .tobago-box");
-  let $uiRepeatSections = jQueryFrameFn("#page\\:mainForm\\:uiRepeat .tobago-section");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $reset().click();
+    resetFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($forEachBoxes().length, 3);
-    assert.equal($uiRepeatSections().length, 3);
+    assert.equal(forEachBoxesFn().length, 3);
+    assert.equal(uiRepeatSectionsFn().length, 3);
   });
   TTT.action(function () {
-    $name().val("Mississippi");
-    $length().val("6275");
-    $discharge().val("16200");
-    $add().click();
+    nameFn().val("Mississippi");
+    lengthFn().val("6275");
+    dischargeFn().val("16200");
+    addFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($forEachBoxes().length, 4);
-    assert.equal($uiRepeatSections().length, 4);
+    assert.equal(forEachBoxesFn().length, 4);
+    assert.equal(uiRepeatSectionsFn().length, 4);
   });
   TTT.action(function () {
-    $reset().click();
+    resetFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($forEachBoxes().length, 3);
-    assert.equal($uiRepeatSections().length, 3);
+    assert.equal(forEachBoxesFn().length, 3);
+    assert.equal(uiRepeatSectionsFn().length, 3);
   });
   TTT.startTest();
 });
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 3f662e3..5407106 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,302 +16,302 @@
  */
 
 QUnit.test("Simple Collapsible Box: show -> hide transition", function (assert) {
-  let $show = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
-  let $content = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
+  let showFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
+  let contentFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($content().length, 1);
+    assert.equal(contentFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($content().length, 0);
+    assert.equal(contentFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Simple Collapsible Box: hide -> show transition", function (assert) {
-  let $show = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
-  let $content = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
+  let showFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:show");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:hide");
+  let contentFn = jQueryFrameFn("#page\\:mainForm\\:controller\\:content");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($content().length, 0);
+    assert.equal(contentFn().length, 0);
   });
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($content().length, 1);
+    assert.equal(contentFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request: open both boxes", function (assert) {
-  let $show1 = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
-  let $show2 = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
-  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = $content2().length;
+  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;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show1().click();
+    show1Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 1);
-    assert.equal($content2().length, content2Length);
+    assert.equal(content1Fn().length, 1);
+    assert.equal(content2Fn().length, content2Length);
   });
   TTT.action(function () {
-    $show2().click();
+    show2Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 1);
-    assert.equal($content2().length, 1);
+    assert.equal(content1Fn().length, 1);
+    assert.equal(content2Fn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request: open box 1, close box 2", function (assert) {
-  let $show1 = jQueryFrameFn("#page\\:mainForm\\:server\\:show1");
-  let $hide2 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
-  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = $content2().length;
+  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;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show1().click();
+    show1Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 1);
-    assert.equal($content2().length, content2Length);
+    assert.equal(content1Fn().length, 1);
+    assert.equal(content2Fn().length, content2Length);
   });
   TTT.action(function () {
-    $hide2().click();
+    hide2Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 1);
-    assert.equal($content2().length, 0);
+    assert.equal(content1Fn().length, 1);
+    assert.equal(content2Fn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request: close box 1, open box 2", function (assert) {
-  let $hide1 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
-  let $show2 = jQueryFrameFn("#page\\:mainForm\\:server\\:show2");
-  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = $content2().length;
+  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;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide1().click();
+    hide1Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 0);
-    assert.equal($content2().length, content2Length);
+    assert.equal(content1Fn().length, 0);
+    assert.equal(content2Fn().length, content2Length);
   });
   TTT.action(function () {
-    $show2().click();
+    show2Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 0);
-    assert.equal($content2().length, 1);
+    assert.equal(content1Fn().length, 0);
+    assert.equal(content2Fn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request: close both boxes", function (assert) {
-  let $hide1 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide1");
-  let $hide2 = jQueryFrameFn("#page\\:mainForm\\:server\\:hide2");
-  let $content1 = jQueryFrameFn("#page\\:mainForm\\:server\\:content1");
-  let $content2 = jQueryFrameFn("#page\\:mainForm\\:server\\:content2");
-  let content2Length = $content2().length;
+  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;
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide1().click();
+    hide1Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 0);
-    assert.equal($content2().length, content2Length);
+    assert.equal(content1Fn().length, 0);
+    assert.equal(content2Fn().length, content2Length);
   });
   TTT.action(function () {
-    $hide2().click();
+    hide2Fn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($content1().length, 0);
-    assert.equal($content2().length, 0);
+    assert.equal(content1Fn().length, 0);
+    assert.equal(content2Fn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Client Side: show -> hide transition", function (assert) {
-  let $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  let $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  let showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  let boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($box().hasClass("tobago-collapsed"), false);
+    assert.equal(boxFn().hasClass("tobago-collapsed"), false);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($box().hasClass("tobago-collapsed"), true);
+    assert.equal(boxFn().hasClass("tobago-collapsed"), true);
   });
   TTT.startTest();
 });
 
 QUnit.test("Client Side: hide -> show transition", function (assert) {
-  let $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  let $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
+  let showFn = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
+  let boxFn = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($box().hasClass("tobago-collapsed"), true);
+    assert.equal(boxFn().hasClass("tobago-collapsed"), true);
   });
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($box().hasClass("tobago-collapsed"), false);
+    assert.equal(boxFn().hasClass("tobago-collapsed"), false);
   });
   TTT.startTest();
 });
 
 QUnit.test("Client Side: hide content and submit empty string", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $show = jQueryFrameFn("#page\\:mainForm\\:client\\:showNoRequestBox");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:client\\:hideNoRequestBox");
-  let $box = jQueryFrameFn("#page\\:mainForm\\:client\\:noRequestBox");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inNoRequestBox\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:client\\:submitNoRequestBox");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($box().hasClass("tobago-collapsed"), true);
+    assert.equal(boxFn().hasClass("tobago-collapsed"), true);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Ajax: show -> hide transition", function (assert) {
-  let $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  let showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 1);
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 0);
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Ajax: hide -> show transition", function (assert) {
-  let $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
+  let showFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 0);
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 1);
+    assert.equal(inFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Ajax: hide content and submit empty string", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages .tobago-messages");
-  let $show = jQueryFrameFn("#page\\:mainForm\\:ajax\\:showAjaxBox");
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:ajax\\:hideAjaxBox");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjaxBox\\:\\:field");
-  let $submit = jQueryFrameFn("#page\\:mainForm\\:ajax\\:submitAjaxBox");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 1);
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $hide().click();
+    inFn().val("");
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 0);
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
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 09a7d4b..4e7ba69 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,169 +16,169 @@
  */
 
 QUnit.test("Simple Popup", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $open = jQueryFrameFn("#page\\:mainForm\\:simple\\:open1");
-  let $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:simple\\:submitOnPage1");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:in1\\:\\:field");
-  let $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:submitOnPopup1");
-  let $close = jQueryFrameFn("#page\\:mainForm\\:simple\\:controllerPopup\\:close1");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $open().click();
+    openFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 1);
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submitOnPopup().click();
+    inFn().val("some text");
+    submitOnPopupFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($in().length, 1);
-    assert.equal($in().val(), "some text");
+    assert.equal(messagesFn().length, 0);
+    assert.equal(inFn().length, 1);
+    assert.equal(inFn().val(), "some text");
   });
   TTT.action(function () {
-    $in().val("");
-    $submitOnPopup().click();
+    inFn().val("");
+    submitOnPopupFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($in().length, 1);
-    assert.equal($in().val(), "");
+    assert.equal(messagesFn().length, 1);
+    assert.equal(inFn().length, 1);
+    assert.equal(inFn().val(), "");
   });
   TTT.action(function () {
-    $close().click();
+    closeFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 0);
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submitOnPage().click();
+    submitOnPageFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $open = jQueryFrameFn("#page\\:mainForm\\:server\\:open2");
-  let $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:server\\:submitOnPage2");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:in2\\:\\:field");
-  let $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:submitOnPopup2");
-  let $close = jQueryFrameFn("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:close2");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $open().click();
+    openFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 1);
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submitOnPopup().click();
+    inFn().val("some text");
+    submitOnPopupFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($in().length, 1);
-    assert.equal($in().val(), "some text");
+    assert.equal(messagesFn().length, 0);
+    assert.equal(inFn().length, 1);
+    assert.equal(inFn().val(), "some text");
   });
   TTT.action(function () {
-    $in().val("");
-    $submitOnPopup().click();
+    inFn().val("");
+    submitOnPopupFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($in().length, 1);
-    assert.equal($in().val(), "");
+    assert.equal(messagesFn().length, 1);
+    assert.equal(inFn().length, 1);
+    assert.equal(inFn().val(), "");
   });
   TTT.action(function () {
-    $close().click();
+    closeFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($in().length, 0);
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submitOnPage().click();
+    submitOnPageFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 0);
+    assert.equal(messagesFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Client Side", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $open = jQueryFrameFn("#page\\:mainForm\\:client\\:open3");
-  let $submitOnPage = jQueryFrameFn("#page\\:mainForm\\:client\\:submitOnPage3");
-  let $popupCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:in3\\:\\:field");
-  let $submitOnPopup = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:submitOnPopup3");
-  let $close = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPopup\\:close3");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $open().click();
+    openFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popupCollapsed().val(), "false");
+    assert.equal(popupCollapsedFn().val(), "false");
   });
   TTT.action(function () {
-    $close().click();
+    closeFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popupCollapsed().val(), "true");
+    assert.equal(popupCollapsedFn().val(), "true");
   });
   TTT.action(function () {
-    $open().click();
+    openFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popupCollapsed().val(), "false");
+    assert.equal(popupCollapsedFn().val(), "false");
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submitOnPopup().click();
+    inFn().val("some text");
+    submitOnPopupFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($popupCollapsed().val(), "true");
+    assert.equal(messagesFn().length, 0);
+    assert.equal(popupCollapsedFn().val(), "true");
   });
   TTT.action(function () {
-    $open().click();
+    openFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($popupCollapsed().val(), "false");
+    assert.equal(popupCollapsedFn().val(), "false");
   });
   TTT.action(function () {
-    $in().val("");
-    $submitOnPopup().click();
+    inFn().val("");
+    submitOnPopupFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($popupCollapsed().val(), "true");
+    assert.equal(messagesFn().length, 1);
+    assert.equal(popupCollapsedFn().val(), "true");
   });
   TTT.action(function () {
-    $submitOnPage().click();
+    submitOnPageFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($messages().length, 1);
+    assert.equal(messagesFn().length, 1);
   });
   TTT.startTest();
 });
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 8648ce5..c9cd0aa 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,230 +16,230 @@
  */
 
 QUnit.test("Simple Panel", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
-  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:simple\\:simplePanel\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
-  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:server\\:serverPanel\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Client Side", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
-  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientPanel\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.asserts(2, function () {
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Ajax", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
-  let $panelCollapsed = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxPanel\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($panelCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(panelCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($panelCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(panelCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
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 b42615b..fd27fbf 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,230 +16,230 @@
  */
 
 QUnit.test("Simple Panel", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:submitSimple");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:showSimple");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:simple\\:hideSimple");
-  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:simple\\:simpleSection\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:simple\\:inSimple\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Full Server Request", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:server\\:submitServer");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:server\\:showServer");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:server\\:hideServer");
-  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:server\\:fullRequestSection\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:server\\:inServer\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
 
 QUnit.test("Client Side", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:client\\:submitClient");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:client\\:showClient");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:client\\:hideClient");
-  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:client\\:clientSection\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:client\\:inClient\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.asserts(2, function () {
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.startTest();
 });
 
 QUnit.test("Ajax", function (assert) {
-  let $messages = jQueryFrameFn("#page\\:messages.tobago-messages div");
-  let $submit = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:submitAjax");
-  let $show = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:showAjax");
-  let $hide = jQueryFrameFn("#\\page\\:mainForm\\:ajax\\:hideAjax");
-  let $sectionCollapsed = jQueryFrameFn("#page\\:mainForm\\:ajax\\:ajaxSection\\:\\:collapse");
-  let $in = jQueryFrameFn("#page\\:mainForm\\:ajax\\:inAjax\\:\\:field");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $show().click();
+    showFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("some text");
-    $submit().click();
+    inFn().val("some text");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $in().val("");
-    $submit().click();
+    inFn().val("");
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 1);
-    assert.equal($sectionCollapsed().val(), "false");
-    assert.equal($in().length, 1);
+    assert.equal(messagesFn().length, 1);
+    assert.equal(sectionCollapsedFn().val(), "false");
+    assert.equal(inFn().length, 1);
   });
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.action(function () {
-    $submit().click();
+    submitFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.equal($messages().length, 0);
-    assert.equal($sectionCollapsed().val(), "true");
-    assert.equal($in().length, 0);
+    assert.equal(messagesFn().length, 0);
+    assert.equal(sectionCollapsedFn().val(), "true");
+    assert.equal(inFn().length, 0);
   });
   TTT.startTest();
 });
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 021566c..f4b04d7 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
@@ -19,18 +19,18 @@ QUnit.test("Deprecated: 'Ma'", function (assert) {
   let inputString = "Ma";
   let expectedLength = 4;
 
-  let $in = jQueryFrameFn("#page\\:mainForm\\:deprecated\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:deprecated");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:deprecated\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:deprecated");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val(inputString).trigger('input');
+    inFn().val(inputString).trigger('input');
   });
   TTT.waitForResponse();
   TTT.asserts(expectedLength + 1, function () {
-    assert.equal($suggestions().length, expectedLength);
+    assert.equal(suggestionsFn().length, expectedLength);
     for (i = 0; i < expectedLength; i++) {
-      assert.ok($suggestions().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
+      assert.ok(suggestionsFn().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
     }
   });
   TTT.startTest();
@@ -40,18 +40,18 @@ QUnit.test("Replacement: 'Ma'", function (assert) {
   let inputString = "Ma";
   let expectedLength = 4;
 
-  let $in = jQueryFrameFn("#page\\:mainForm\\:replacement\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:replacement");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:replacement\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:replacement");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val(inputString).trigger('input');
+    inFn().val(inputString).trigger('input');
   });
   TTT.waitForResponse();
   TTT.asserts(expectedLength + 1, function () {
-    assert.equal($suggestions().length, expectedLength);
+    assert.equal(suggestionsFn().length, expectedLength);
     for (i = 0; i < expectedLength; i++) {
-      assert.ok($suggestions().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
+      assert.ok(suggestionsFn().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
     }
   });
   TTT.startTest();
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 aff2ed1..3396ce7 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
@@ -44,18 +44,18 @@ QUnit.test("Basics: 'Mars'", function (assert) {
 });
 
 function testMarsBasics(assert, inputString, expectedLength) {
-  let $in = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
-  let $suggestions = getSuggestions("#page\\:mainForm\\:input");
+  let inFn = jQueryFrameFn("#page\\:mainForm\\:input\\:\\:field");
+  let suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in().val(inputString).trigger('input');
+    inFn().val(inputString).trigger('input');
   });
   TTT.waitForResponse();
   TTT.asserts(expectedLength + 1, function () {
-    assert.equal($suggestions().length, expectedLength);
+    assert.equal(suggestionsFn().length, expectedLength);
     for (i = 0; i < expectedLength; i++) {
-      assert.ok($suggestions().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
+      assert.ok(suggestionsFn().eq(i).find("strong").text().toUpperCase().indexOf(inputString.toUpperCase()) >= 0);
     }
   });
   TTT.startTest();
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 4bcae10..62ba05d 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,34 +16,34 @@
  */
 
 QUnit.test("Execute 'AJAX' entry in dropdown menu", function (assert) {
-  let $dropdownMenuButton = jQueryFrameFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
-  let $ajaxEntry = jQueryFrameFn("#page\\:mainForm\\:ajaxEntry");
-  let $input = jQueryFrameFn("#page\\:mainForm\\:inputAjax\\:\\:field");
-  let $output = jQueryFrameFn("#page\\:mainForm\\:outputAjax .tobago-out");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
-    assert.equal($ajaxEntry().parents(".tobago-page-menuStore").length, 0, "Dropdown menu should be closed.");
+    assert.equal(ajaxEntryFn().parents(".tobago-page-menuStore").length, 0, "Dropdown menu should be closed.");
   });
   TTT.action(function () {
-    $dropdownMenuButton().click();
+    dropdownMenuButtonFn().click();
   });
   TTT.asserts(1, function () {
-    assert.equal($ajaxEntry().parents(".tobago-page-menuStore").length, 1, "Dropdown menu should be opened.");
+    assert.equal(ajaxEntryFn().parents(".tobago-page-menuStore").length, 1, "Dropdown menu should be opened.");
   });
   TTT.action(function () {
-    $input().val("Tobago, yay!");
+    inputFn().val("Tobago, yay!");
   });
   TTT.asserts(1, function () {
-    assert.equal($output().text(), "", "Output should be empty.");
+    assert.equal(outputFn().text(), "", "Output should be empty.");
   });
   TTT.action(function () {
-    $ajaxEntry().click();
+    ajaxEntryFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($output().text(), "Tobago, yay!");
-    assert.equal($ajaxEntry().parents(".tobago-page-menuStore").length, 0, "Dropdown menu should be closed.");
+    assert.equal(outputFn().text(), "Tobago, yay!");
+    assert.equal(ajaxEntryFn().parents(".tobago-page-menuStore").length, 0, "Dropdown menu should be closed.");
   });
   TTT.startTest();
 });
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 1e85de2..9e1900a 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,86 +16,86 @@
  */
 
 QUnit.test("Standard Action Button", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:standardButtonAction");
-  let $destinationSection = jQueryFrameFn("#page\\:actionSection");
-  testStandardCommands($command, $destinationSection, assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardButtonAction");
+  let destinationSectionFn = jQueryFrameFn("#page\\:actionSection");
+  testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 QUnit.test("Standard Link Button", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:standardButtonLink");
-  let $destinationSection = jQueryFrameFn("#page\\:linkSection");
-  testStandardCommands($command, $destinationSection, assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardButtonLink");
+  let destinationSectionFn = jQueryFrameFn("#page\\:linkSection");
+  testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 QUnit.test("Standard Action Link", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:standardLinkAction");
-  let $destinationSection = jQueryFrameFn("#page\\:actionSection");
-  testStandardCommands($command, $destinationSection, assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardLinkAction");
+  let destinationSectionFn = jQueryFrameFn("#page\\:actionSection");
+  testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
 QUnit.test("Standard Link Link", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:standardLinkLink");
-  let $destinationSection = jQueryFrameFn("#page\\:linkSection");
-  testStandardCommands($command, $destinationSection, assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:standardLinkLink");
+  let destinationSectionFn = jQueryFrameFn("#page\\:linkSection");
+  testStandardCommands(commandFn, destinationSectionFn, assert);
 });
 
-function testStandardCommands($command, $destinationSection, assert) {
-  let $back = jQueryFrameFn("#page\\:back");
+function testStandardCommands(commandFn, destinationSectionFn, assert) {
+  let backFn = jQueryFrameFn("#page\\:back");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $command()[0].click();
+    commandFn()[0].click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($destinationSection().length, 1);
+    assert.equal(destinationSectionFn().length, 1);
   });
   TTT.action(function () {
-    $back()[0].click();
+    backFn()[0].click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($command().length, 1);
+    assert.equal(commandFn().length, 1);
   });
   TTT.startTest();
 }
 
 QUnit.test("Target Action Button", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:targetButtonAction");
-  testTargetCommands($command, "#textInput", "accessed by action", assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetButtonAction");
+  testTargetCommands(commandFn, "#textInput", "accessed by action", assert);
 });
 
 QUnit.test("Target Link Button", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:targetButtonLink");
-  testTargetCommands($command, "#textInput", "accessed by link", assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetButtonLink");
+  testTargetCommands(commandFn, "#textInput", "accessed by link", assert);
 });
 
 QUnit.test("Target Action Link", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:targetLinkAction");
-  testTargetCommands($command, "#textInput", "accessed by action", assert);
+  let commandFn = jQueryFrameFn("#page\\:mainForm\\:targetLinkAction");
+  testTargetCommands(commandFn, "#textInput", "accessed by action", assert);
 });
 
 QUnit.test("Target Link Link", function (assert) {
-  let $command = jQueryFrameFn("#page\\:mainForm\\:targetLinkLink");
-  testTargetCommands($command, "#textInput", "accessed by link", assert);
+  let 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 $dropdownMenu = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
-  let $styleAsItem = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
+  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");
 
-  assert.equal($dropdownMenu().length, 1);
-  assert.equal($styleAsItem().length, 0);
-  assert.equal($button().css("width"), "200px");
+  assert.equal(dropdownMenuFn().length, 1);
+  assert.equal(styleAsItemFn().length, 0);
+  assert.equal(buttonFn().css("width"), "200px");
 });
 
-function testTargetCommands($command, targetTextInputSelector, expectedText, assert) {
+function testTargetCommands(commandFn, targetTextInputSelector, expectedText, assert) {
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $command()[0].click();
+    commandFn()[0].click();
   });
   TTT.waitMs(2000); //TobagoTestTools.waitForResponse() didn't recognize responses on a target frame, so we just wait
   TTT.asserts(1, function () {
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 3146546..4c2f786 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,74 +16,74 @@
  */
 
 QUnit.test("Test h1", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link1");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink1");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link1");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink1");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h2", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link2");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink2");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link2");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink2");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h3", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link3");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink3");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link3");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink3");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h4", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link4");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink4");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link4");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink4");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h5", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link5");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink5");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link5");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink5");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test h6", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link6");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink6");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link6");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink6");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
 QUnit.test("Test no heading", function (assert) {
-  let $alink = jQueryFrameFn("#page\\:mainForm\\:link0");
-  let $buttonlink = jQueryFrameFn("#page\\:mainForm\\:actionLink0");
-  testFont(assert, $alink, $buttonlink);
+  let alinkFn = jQueryFrameFn("#page\\:mainForm\\:link0");
+  let buttonlinkFn = jQueryFrameFn("#page\\:mainForm\\:actionLink0");
+  testFont(assert, alinkFn, buttonlinkFn);
 });
 
-function testFont(assert, $alink, $buttonlink) {
+function testFont(assert, alinkFn, buttonlinkFn) {
   assert.expect(5);
 
-  assert.equal($alink().css("color"), $buttonlink().css("color"));
-  assert.equal($alink().css("font-family"), $buttonlink().css("font-family"));
-  assert.equal($alink().css("font-size"), $buttonlink().css("font-size"));
-  assert.equal($alink().css("font-weight"), $buttonlink().css("font-weight"));
-  assert.equal($alink().css("text-decoration"), $buttonlink().css("text-decoration"));
+  assert.equal(alinkFn().css("color"), buttonlinkFn().css("color"));
+  assert.equal(alinkFn().css("font-family"), buttonlinkFn().css("font-family"));
+  assert.equal(alinkFn().css("font-size"), buttonlinkFn().css("font-size"));
+  assert.equal(alinkFn().css("font-weight"), buttonlinkFn().css("font-weight"));
+  assert.equal(alinkFn().css("text-decoration"), buttonlinkFn().css("text-decoration"));
 }
 
 QUnit.test("Ajax reload for section 2", function (assert) {
-  let $reloadButton = jQueryFrameFn("#page\\:mainForm\\:reloadSection2");
-  let $section2Header = jQueryFrameFn("#page\\:mainForm\\:levelTwoSection h3");
-  let $timestamp = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
-  let firstTimestamp = $timestamp().text();
+  let reloadButtonFn = jQueryFrameFn("#page\\:mainForm\\:reloadSection2");
+  let section2HeaderFn = jQueryFrameFn("#page\\:mainForm\\:levelTwoSection h3");
+  let timestampFn = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
+  let firstTimestamp = timestampFn().text();
 
   let TTT = new TobagoTestTools(assert);
   TTT.asserts(1, function () {
-    assert.equal($section2Header().length, 1);
+    assert.equal(section2HeaderFn().length, 1);
   });
   TTT.action(function () {
-    $reloadButton().click();
+    reloadButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(2, function () {
-    assert.equal($section2Header().length, 1);
-    assert.ok(firstTimestamp < $timestamp().text(), "value of new timestamp must be higher");
+    assert.equal(section2HeaderFn().length, 1);
+    assert.ok(firstTimestamp < timestampFn().text(), "value of new timestamp must be higher");
   });
   TTT.startTest();
 });
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 cb76dc8..3d406bd 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,52 +16,52 @@
  */
 
 QUnit.test("ajax excecute", function (assert) {
-  let $in1 = jQueryFrameFn("#page\\:mainForm\\:in1\\:\\:field");
-  let $in2 = jQueryFrameFn("#page\\:mainForm\\:in2\\:\\:field");
-  let $in3 = jQueryFrameFn("#page\\:mainForm\\:in3\\:\\:field");
-  let $in4 = jQueryFrameFn("#page\\:mainForm\\:in4\\:\\:field");
-  let $clearButton = jQueryFrameFn("#page\\:mainForm\\:clear");
-  let $submitButton = jQueryFrameFn("#page\\:mainForm\\:submit");
-  let $reloadButton = jQueryFrameFn("#page\\:mainForm\\:reload");
+  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");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $in1().val("a");
-    $in2().val("b");
-    $in3().val("c");
-    $in4().val("d");
-    $clearButton().click();
+    in1Fn().val("a");
+    in2Fn().val("b");
+    in3Fn().val("c");
+    in4Fn().val("d");
+    clearButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($in1().val(), "");
-    assert.equal($in2().val(), "");
-    assert.equal($in3().val(), "");
-    assert.equal($in4().val(), "");
+    assert.equal(in1Fn().val(), "");
+    assert.equal(in2Fn().val(), "");
+    assert.equal(in3Fn().val(), "");
+    assert.equal(in4Fn().val(), "");
   });
   TTT.action(function () {
-    $in1().val("a");
-    $in2().val("b");
-    $in3().val("c");
-    $in4().val("d");
-    $submitButton().click();
+    in1Fn().val("a");
+    in2Fn().val("b");
+    in3Fn().val("c");
+    in4Fn().val("d");
+    submitButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($in1().val(), "a");
-    assert.equal($in2().val(), "b");
-    assert.equal($in3().val(), "c");
-    assert.equal($in4().val(), "");
+    assert.equal(in1Fn().val(), "a");
+    assert.equal(in2Fn().val(), "b");
+    assert.equal(in3Fn().val(), "c");
+    assert.equal(in4Fn().val(), "");
   });
   TTT.action(function () {
-    $reloadButton().click();
+    reloadButtonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(4, function () {
-    assert.equal($in1().val(), "a");
-    assert.equal($in2().val(), "");
-    assert.equal($in3().val(), "c");
-    assert.equal($in4().val(), "");
+    assert.equal(in1Fn().val(), "a");
+    assert.equal(in2Fn().val(), "");
+    assert.equal(in3Fn().val(), "c");
+    assert.equal(in4Fn().val(), "");
   });
   TTT.startTest();
 });
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 2280556..866752a 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,24 +16,24 @@
  */
 
 QUnit.test("ajax excecute", function (assert) {
-  let $timestamp = jQueryFrameFn("#page\\:mainForm\\:timestamp span");
-  let $text = jQueryFrameFn("#page\\:mainForm\\:outText span");
-  let $tip = jQueryFrameFn("#page\\:mainForm\\:outTip span");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:ajaxButton");
+  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");
 
-  let timestampValue = $timestamp().text();
-  let textValue = $text().text();
-  let tipValue = $tip().attr('title');
+  let timestampValue = timestampFn().text();
+  let textValue = textFn().text();
+  let tipValue = tipFn().attr('title');
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $button().click();
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(3, function () {
-    assert.notEqual($timestamp().text(), timestampValue);
-    assert.equal($text().text(), textValue);
-    assert.equal($tip().attr('title'), tipValue);
+    assert.notEqual(timestampFn().text(), timestampValue);
+    assert.equal(textFn().text(), textValue);
+    assert.equal(tipFn().attr('title'), tipValue);
   });
   TTT.startTest();
 });
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 62f7552..fe98b71 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
@@ -17,62 +17,62 @@
 
 QUnit.test("tc:button", function (assert) {
   let eventNames = ["click", "dblclick", "focus", "blur"];
-  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:buttonevent");
-  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:buttonajax");
-  testEvent(assert, "button", eventNames, $eventComponent, $ajaxComponent, null);
+  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:buttonevent");
+  let 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 $eventComponent = jQueryFrameFn("#page\\:mainForm\\:inevent\\:\\:field");
-  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:inajax\\:\\:field");
-  let changeValue = function ($component) {
-    let oldValue = $component().val();
+  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";
     if (oldValue === "hello") {
       newValue = "hello there!"
     }
-    $component().val(newValue);
+    componentFn().val(newValue);
   };
-  testEvent(assert, "in", eventNames, $eventComponent, $ajaxComponent, changeValue);
+  testEvent(assert, "in", eventNames, eventComponentFn, ajaxComponentFn, changeValue);
 });
 
 QUnit.test("tc:row", function (assert) {
   let eventNames = ["click", "dblclick"];
-  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
-  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
-  testEvent(assert, "row", eventNames, $eventComponent, $ajaxComponent, null);
+  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
+  let 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 $eventComponent = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
-  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
-  let changeValue = function ($component) {
+  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();
     if (currentEvent !== "click") {
-      $component().prop("checked", !$component().prop("checked"));
+      componentFn().prop("checked", !componentFn().prop("checked"));
     }
   };
-  testEvent(assert, "selectBooleanCheckbox", eventNames, $eventComponent, $ajaxComponent, changeValue);
+  testEvent(assert, "selectBooleanCheckbox", eventNames, eventComponentFn, ajaxComponentFn, changeValue);
 });
 
 QUnit.test("tc:textarea", function (assert) {
   let eventNames = ["change", "click", "dblclick", "focus", "blur"];
-  let $eventComponent = jQueryFrameFn("#page\\:mainForm\\:textareaevent\\:\\:field");
-  let $ajaxComponent = jQueryFrameFn("#page\\:mainForm\\:textareaajax\\:\\:field");
-  let changeValue = function ($component) {
-    let oldValue = $component().val();
+  let eventComponentFn = jQueryFrameFn("#page\\:mainForm\\:textareaevent\\:\\:field");
+  let ajaxComponentFn = jQueryFrameFn("#page\\:mainForm\\:textareaajax\\:\\:field");
+  let changeValue = function (componentFn) {
+    let oldValue = componentFn().val();
     let newValue = "hello";
     if (oldValue === "hello") {
       newValue = "hello there!"
     }
-    $component().val(newValue);
+    componentFn().val(newValue);
   };
-  testEvent(assert, "textarea", eventNames, $eventComponent, $ajaxComponent, changeValue);
+  testEvent(assert, "textarea", eventNames, eventComponentFn, ajaxComponentFn, changeValue);
 });
 
-function testEvent(assert, componentName, eventNames, $eventComponent, $ajaxComponent, changeValueFunc) {
+function testEvent(assert, componentName, eventNames, eventComponentFn, ajaxComponentFn, changeValueFunc) {
   let oldActionCount;
   let oldActionListenerCount;
   let oldAjaxListenerCount;
@@ -95,9 +95,9 @@ function testEvent(assert, componentName, eventNames, $eventComponent, $ajaxComp
       oldTimestamp = getTimestamp();
 
       if (changeValueFunc !== null) {
-        changeValueFunc($eventComponent);
+        changeValueFunc(eventComponentFn);
       }
-      $eventComponent().trigger(eventName);
+      eventComponentFn().trigger(eventName);
     });
     TTT.waitForResponse();
     TTT.asserts(5, function () {
@@ -121,9 +121,9 @@ function testEvent(assert, componentName, eventNames, $eventComponent, $ajaxComp
       oldTimestamp = getTimestamp();
 
       if (changeValueFunc !== null) {
-        changeValueFunc($ajaxComponent);
+        changeValueFunc(ajaxComponentFn);
       }
-      $ajaxComponent().trigger(eventName);
+      ajaxComponentFn().trigger(eventName);
     });
     TTT.waitForResponse();
     TTT.asserts(5, function () {
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 1613f8b..c532f3e 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,12 +16,12 @@
  */
 
 QUnit.test("Simple Event", function (assert) {
-  let $button = jQueryFrameFn("#page\\:mainForm\\:simpleEvent");
+  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleEvent");
   let oldCounterValues = getCounterValues();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $button().click();
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(11, function () {
@@ -31,12 +31,12 @@ QUnit.test("Simple Event", function (assert) {
 });
 
 QUnit.test("Simple Ajax", function (assert) {
-  let $button = jQueryFrameFn("#page\\:mainForm\\:simpleAjax");
+  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleAjax");
   let oldCounterValues = getCounterValues();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $button().click();
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(11, function () {
@@ -46,12 +46,12 @@ QUnit.test("Simple Ajax", function (assert) {
 });
 
 QUnit.test("Simple EventAjax", function (assert) {
-  let $button = jQueryFrameFn("#page\\:mainForm\\:simpleEventAjax");
+  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:simpleEventAjax");
   let oldCounterValues = getCounterValues();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $button().click();
+    buttonFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(11, function () {
@@ -61,74 +61,74 @@ QUnit.test("Simple EventAjax", function (assert) {
 });
 
 QUnit.test("Advanced Button: Option 1", function (assert) {
-  let $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
-  testEventOption(assert, $option, $button, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
+  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
+  let 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 $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
+  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
+  let buttonFn = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
 
-  testAjaxOption(assert, $option, $button, "dblclick", 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1);
+  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 $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
-  let $button = jQueryFrameFn("#page\\:mainForm\\:advancedButton");
-  testAjaxOption(assert, $option, $button, "click", 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1);
+  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
+  let 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 $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
-  let $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
-  testEventOption(assert, $option, $row, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
+  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:0");
+  let 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 $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
-  let $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
-  testAjaxOption(assert, $option, $row, "dblclick", 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1);
+  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:1");
+  let 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 $option = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
-  let $row = jQueryFrameFn("#page\\:mainForm\\:sheet\\:0\\:row");
-  testAjaxOption(assert, $option, $row, "click", 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1);
+  let optionFn = jQueryFrameFn("#page\\:mainForm\\:advancedSelector\\:\\:2");
+  let 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 $input = jQueryFrameFn("#page\\:mainForm\\:inputClick\\:\\:field");
-  testInputSection(assert, $input, "click");
+  let inputFn = jQueryFrameFn("#page\\:mainForm\\:inputClick\\:\\:field");
+  testInputSection(assert, inputFn, "click");
 });
 
-function testEventOption(assert, $option, $component, event,
+function testEventOption(assert, optionFn, componentFn, event,
                          buttonActionPlus, buttonActionListenerPlus,
                          action1Plus, actionListener1Plus, ajaxListener1Plus,
                          action2Plus, actionListener2Plus, ajaxListener2Plus,
                          action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
-  let $operationOut = jQueryFrameFn("#page\\:mainForm\\:operationOut");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  let operationOutFn = jQueryFrameFn("#page\\:mainForm\\:operationOut");
   let oldCounterValues = getCounterValues();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($operationOut().length, 0, "Content of operation test box must be hidden.");
+    assert.equal(operationOutFn().length, 0, "Content of operation test box must be hidden.");
   });
   TTT.action(function () {
-    $option().click();
+    optionFn().click();
   });
   TTT.waitForResponse();
   TTT.action(function () {
-    $component().trigger(event);
+    componentFn().trigger(event);
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    assert.equal($operationOut().length, 1, "Content of operation test box must be shown.");
+    assert.equal(operationOutFn().length, 1, "Content of operation test box must be shown.");
 
     compareCounterValues(assert, oldCounterValues,
         buttonActionPlus, buttonActionListenerPlus,
@@ -139,33 +139,33 @@ function testEventOption(assert, $option, $component, event,
   TTT.startTest();
 }
 
-function testAjaxOption(assert, $option, $component, event,
+function testAjaxOption(assert, optionFn, componentFn, event,
                         buttonActionPlus, buttonActionListenerPlus,
                         action1Plus, actionListener1Plus, ajaxListener1Plus,
                         action2Plus, actionListener2Plus, ajaxListener2Plus,
                         action3Plus, actionListener3Plus, ajaxListener3Plus) {
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
-  let $operationOut = jQueryFrameFn("#page\\:mainForm\\:operationOut");
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+  let operationOutFn = jQueryFrameFn("#page\\:mainForm\\:operationOut");
   let oldCounterValues = getCounterValues();
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
-    assert.equal($operationOut().length, 0, "Content of operation test box must be hidden.");
+    assert.equal(operationOutFn().length, 0, "Content of operation test box must be hidden.");
   });
   TTT.action(function () {
-    $option().click();
+    optionFn().click();
   });
   TTT.waitForResponse();
   TTT.action(function () {
-    $component().trigger(event);
+    componentFn().trigger(event);
   });
   TTT.waitForResponse();
   TTT.asserts(12, function () {
-    assert.equal($operationOut().length, 1, "Content of operation test box must be shown.");
+    assert.equal(operationOutFn().length, 1, "Content of operation test box must be shown.");
 
     compareCounterValues(assert, oldCounterValues,
         buttonActionPlus, buttonActionListenerPlus,
@@ -176,19 +176,19 @@ function testAjaxOption(assert, $option, $component, event,
   TTT.startTest();
 }
 
-function testInputSection(assert, $input, eventName) {
-  let $hide = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
+function testInputSection(assert, inputFn, eventName) {
+  let hideFn = jQueryFrameFn("#page\\:mainForm\\:hideOperationTextBox");
 
   let TTT = new TobagoTestTools(assert);
   TTT.action(function () {
-    $hide().click();
+    hideFn().click();
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {
     assert.ok(isOperationTestBoxCollapsed(), "Content of operation test box must be hidden.");
   });
   TTT.action(function () {
-    $input().trigger(eventName);
+    inputFn().trigger(eventName);
   });
   TTT.waitForResponse();
   TTT.asserts(1, function () {

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

Mime
View raw message