diff --git a/sahi-core/htdocs/spr/concat.js b/sahi-core/htdocs/spr/concat.js
index 0348911d..795ba52b 100644
--- a/sahi-core/htdocs/spr/concat.js
+++ b/sahi-core/htdocs/spr/concat.js
@@ -5021,7 +5021,6 @@ Sahi.prototype.prepareADs = function(){
 	this.addAD({tag: "ASIDE", type: null, event:"click", name: "_aside", attributes: ["sahiText", "id", "className", "index"], action: "_click", value: "sahiText"});
 	this.addAD({tag: "FOOTER", type: null, event:"click", name: "_footer", attributes: ["sahiText", "id", "className", "index"], action: "_click", value: "sahiText"});
   this.addAD({tag: "ARTICLE", type: null, event:"click", name: "_article", attributes: ["sahiText", "id", "className", "index"], action: "_click", value: "sahiText"});
-  this.addAD({tag: "MAIN", type: null, event:"click", name: "_main", attributes: ["sahiText", "id", "className", "index"], action: "_click", value: "sahiText"});
   this.addAD({tag: "FIGURE", type: null, event:"click", name: "_figure", attributes: ["sahiText", "id", "className", "index"], action: "_click", value: "sahiText"});
   this.addAD({tag: "ADDRESS", type: null, event:"click", name: "_address", attributes: ["sahiText", "id", "className", "index"], action: "_click", value: "sahiText"});
 };
diff --git a/sahi-test-webapp/src/main/sahi/integration/html5BlockElements.sah b/sahi-test-webapp/src/main/sahi/integration/html5BlockElements.sah
new file mode 100644
index 00000000..e9b83108
--- /dev/null
+++ b/sahi-test-webapp/src/main/sahi/integration/html5BlockElements.sah
@@ -0,0 +1,26 @@
+_include("pages/includeAll.js");
+
+$Index.goTo();
+_click(_link("HTML5 tags"));
+
+_assertExists(_header(0));
+_assertExists(_header("headerid"));
+_assertExists(_header("headerclass"));
+_assertExists(_aside(0));
+_assertExists(_nav(0));
+_assertExists(_footer(0));
+_assertExists(_article(0));
+_assertExists(_figure(0));
+_assertExists(_address(0));
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sahi-test-webapp/src/main/sahi/integration/html5InputElements.sah b/sahi-test-webapp/src/main/sahi/integration/html5InputElements.sah
new file mode 100644
index 00000000..642be21a
--- /dev/null
+++ b/sahi-test-webapp/src/main/sahi/integration/html5InputElements.sah
@@ -0,0 +1,21 @@
+_include("pages/includeAll.js");
+
+$Index.goTo();
+
+_click(_link("HTML5 input types"));
+_assertExists(_datebox("date"));
+_setValue(_datebox("date"), "2002-03-02");
+_assertEqual("2002-03-02", _getValue(_datebox("date")));
+_assertExists(_numberbox("number"));
+_setValue(_numberbox("number"), "532");
+_assertEqual("532", _getValue(_numberbox("number")));
+_assertExists(_rangebox("range"));
+_setValue(_rangebox("range"), "80");
+_assertEqual("80", _getValue(_rangebox("range")));
+
+
+
+
+
+
+
diff --git a/sahi-test-webapp/src/main/sahi/integration/pages/html5BlockElements.js b/sahi-test-webapp/src/main/sahi/integration/pages/html5BlockElements.js
deleted file mode 100644
index 1e8e527c..00000000
--- a/sahi-test-webapp/src/main/sahi/integration/pages/html5BlockElements.js
+++ /dev/null
@@ -1,7 +0,0 @@
-$Html5BlockElements = new $Page();
-
-$Html5BlockElements.goTo = function() {
-  $Index.goTo();
-  _click(_link("HTML5 tags"));
-
-}
diff --git a/sahi-test-webapp/src/main/sahi/integration/pages/includeAll.js b/sahi-test-webapp/src/main/sahi/integration/pages/includeAll.js
index cc4a940e..d2b144aa 100644
--- a/sahi-test-webapp/src/main/sahi/integration/pages/includeAll.js
+++ b/sahi-test-webapp/src/main/sahi/integration/pages/includeAll.js
@@ -2,4 +2,3 @@ _include("prototype.js")
 _include("index.js")
 _include("alert.js");
 _include("form.js");
-_include("html5BlockElements.js");
\ No newline at end of file
diff --git a/sahi-test-webapp/src/main/sahi/scripts/html5BlockElements.sah b/sahi-test-webapp/src/main/sahi/scripts/html5BlockElements.sah
deleted file mode 100644
index bb92e617..00000000
--- a/sahi-test-webapp/src/main/sahi/scripts/html5BlockElements.sah
+++ /dev/null
@@ -1,3 +0,0 @@
-_include("pages/includeAll.js");
-
-$Html5BlockElements.goTo();
\ No newline at end of file
diff --git a/sahi-test-webapp/src/main/webapp/html5-elements/tags.htm b/sahi-test-webapp/src/main/webapp/html5-elements/tags.htm
index 54b26fbc..c9ac2f0d 100644
--- a/sahi-test-webapp/src/main/webapp/html5-elements/tags.htm
+++ b/sahi-test-webapp/src/main/webapp/html5-elements/tags.htm
@@ -84,11 +84,11 @@ <h1>HTML5 Elements</h1>
     </nav>
   </header>
   <section>
-    <header>
+    <header id="headerid">
       <h2>Section header</h2>
     </header>
     <article>
-      <header>
+      <header class="headerclass">
         <h3>Article header</h3>
       </header>
       <div>