diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js b/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
index 020f8b7..6698afa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
@@ -21,7 +21,7 @@
 
   static init(element) {
     Demo.initAlert(element);
-    Demo.initInspect(element);
+    // Demo.initInspect(element); //TODO fix inspection
     Demo.initTestLinks(element);
     Demo.initTestFrame(element);
     Demo.initGoogleSearch(element);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-testAll.js b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-testAll.js
index c7b4d7d..638a088 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-testAll.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-testAll.js
@@ -55,4 +55,6 @@
   cycle();
 }
 
-testAll();
+document.addEventListener("DOMContentLoaded", function (event) {
+  testAll();
+});
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
index f2cd500..eb70ce6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
@@ -23,10 +23,11 @@
                 xmlns="http://www.w3.org/1999/xhtml">
   <tc:script file="#{request.contextPath}/script/demo.js"/>
   <tc:script file="#{request.contextPath}/script/qunit-2.9.2.js"/>
-  <tc:script file="#{request.contextPath}/tobago/test/tobago-test-tool.js"/>
-  <tc:script file="#{request.contextPath}/script/tobago-test.js"/>
+  <tc:script file="#{request.contextPath}/tobago/test/tobago-test-tool.js" type="module"/>
+  <tc:script file="#{request.contextPath}/script/tobago-test.js" type="module"/>
   <tc:style file="#{request.contextPath}/style/qunit-2.9.2.css"/>
-  <tc:script file="#{request.contextPath}/#{param['accessTest'] ? 'error/error' : param['base']}.test.js"/>
+  <tc:script file="#{request.contextPath}/#{param['accessTest'] ? 'error/error' : param['base']}.test.js"
+             type="module"/>
 
   <div id="qunit"></div>
   <div id="qunit-fixture"></div>