diff --git a/api/js/etemplate/Et2Box/test/Et2Box.test.ts b/api/js/etemplate/Et2Box/test/Et2Box.test.ts
index b1a618cdab..bdcefcfbbf 100644
--- a/api/js/etemplate/Et2Box/test/Et2Box.test.ts
+++ b/api/js/etemplate/Et2Box/test/Et2Box.test.ts
@@ -1,9 +1,8 @@
 /**
  * Test file for Etemplate webComponent base widget Et2Box
  */
-import {assert, elementUpdated, fixture} from '@open-wc/testing';
+import {assert, elementUpdated, fixture, html} from '@open-wc/testing';
 import {Et2Box} from "../Et2Box";
-import {html} from "lit-element";
 
 describe("Box widget", () =>
 {
diff --git a/api/js/etemplate/Et2Button/test/Et2Button.test.ts b/api/js/etemplate/Et2Button/test/Et2Button.test.ts
index 212bd03368..3734fd606c 100644
--- a/api/js/etemplate/Et2Button/test/Et2Button.test.ts
+++ b/api/js/etemplate/Et2Button/test/Et2Button.test.ts
@@ -1,10 +1,9 @@
 /**
  * Test file for Etemplate webComponent base widget Et2Box
  */
-import {assert, fixture} from '@open-wc/testing';
+import {assert, fixture, html} from '@open-wc/testing';
 import {Et2Button} from "../Et2Button";
 import type {Et2Widget} from "../../Et2Widget/Et2Widget";
-import {html} from "lit-element";
 import * as sinon from 'sinon';
 
 describe("Button widget", () =>
diff --git a/api/js/etemplate/Et2Colorpicker/test/Et2Colorpicker.test.ts b/api/js/etemplate/Et2Colorpicker/test/Et2Colorpicker.test.ts
index fc38aab413..f2ea8b0438 100644
--- a/api/js/etemplate/Et2Colorpicker/test/Et2Colorpicker.test.ts
+++ b/api/js/etemplate/Et2Colorpicker/test/Et2Colorpicker.test.ts
@@ -1,9 +1,8 @@
 /**
  * Test file for Etemplate webComponent base widget Et2Colorpicker
  */
-import {assert, fixture} from '@open-wc/testing';
+import {assert, fixture, html} from '@open-wc/testing';
 import {Et2Colorpicker} from "../Et2Colorpicker";
-import {html} from "lit-element";
 
 
 describe("Colorpicker widget", () =>
diff --git a/api/js/etemplate/Et2Date/test/Et2Date.test.ts b/api/js/etemplate/Et2Date/test/Et2Date.test.ts
index 64af9a6a83..896022ec29 100644
--- a/api/js/etemplate/Et2Date/test/Et2Date.test.ts
+++ b/api/js/etemplate/Et2Date/test/Et2Date.test.ts
@@ -1,9 +1,8 @@
 /**
  * Test file for Etemplate webComponent Date
  */
-import {assert, elementUpdated, fixture} from '@open-wc/testing';
+import {assert, elementUpdated, fixture, html} from '@open-wc/testing';
 import {Et2Date} from "../Et2Date";
-import {html} from "lit-element";
 import * as sinon from 'sinon';
 import {inputBasicTests} from "../../Et2InputWidget/test/InputBasicTests";
 
diff --git a/api/js/etemplate/Et2Date/test/Et2DateTime.test.ts b/api/js/etemplate/Et2Date/test/Et2DateTime.test.ts
index c13c5e651d..cff21bb46e 100644
--- a/api/js/etemplate/Et2Date/test/Et2DateTime.test.ts
+++ b/api/js/etemplate/Et2Date/test/Et2DateTime.test.ts
@@ -1,8 +1,7 @@
 /**
  * Test file for Etemplate webComponent Date
  */
-import {assert, elementUpdated, fixture, oneEvent} from '@open-wc/testing';
-import {html} from "lit-element";
+import {assert, elementUpdated, fixture, html} from '@open-wc/testing';
 import * as sinon from 'sinon';
 import {Et2DateTime} from "../Et2DateTime";
 
diff --git a/api/js/etemplate/Et2Description/test/Et2Description.test.ts b/api/js/etemplate/Et2Description/test/Et2Description.test.ts
index 6d5a8146c4..7e56292917 100644
--- a/api/js/etemplate/Et2Description/test/Et2Description.test.ts
+++ b/api/js/etemplate/Et2Description/test/Et2Description.test.ts
@@ -1,9 +1,8 @@
 /**
  * Test file for Etemplate webComponent Description
  */
-import {assert, elementUpdated, fixture} from '@open-wc/testing';
+import {assert, elementUpdated, fixture, html} from '@open-wc/testing';
 import {Et2Description} from "../Et2Description";
-import {html} from "lit-element";
 import * as sinon from "sinon";
 
 // Reference to component under test
diff --git a/api/js/etemplate/Et2Select/test/Et2SelectBasic.test.ts b/api/js/etemplate/Et2Select/test/Et2SelectBasic.test.ts
index 61e1b61870..e2fe965604 100644
--- a/api/js/etemplate/Et2Select/test/Et2SelectBasic.test.ts
+++ b/api/js/etemplate/Et2Select/test/Et2SelectBasic.test.ts
@@ -9,8 +9,7 @@ window.egw = {
 	image: () => "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkViZW5lXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzJweCIgaGVpZ2h0PSIzMnB4IiB2aWV3Qm94PSIwIDAgMzIgMzIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDMyIDMyIiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBmaWxsPSIjNjk2OTY5IiBkPSJNNi45NDMsMjguNDUzDQoJYzAuOTA2LDAuNzY1LDIuMDk3LDEuMTI3LDMuMjg2LDEuMTA5YzAuNDMsMC4wMTQsMC44NTItMC4wNjgsMS4yNjUtMC4yMDdjMC42NzktMC4xOCwxLjMyOC0wLjQ1LDEuODY2LTAuOTAyTDI5LjQwMywxNC45DQoJYzEuNzcyLTEuNDk4LDEuNzcyLTMuOTI1LDAtNS40MjJjLTEuNzcyLTEuNDk3LTQuNjQ2LTEuNDk3LTYuNDE4LDBMMTAuMTE5LDIwLjM0OWwtMi4zODktMi40MjRjLTEuNDQtMS40NTctMy43NzItMS40NTctNS4yMTIsMA0KCWMtMS40MzgsMS40Ni0xLjQzOCwzLjgyNSwwLDUuMjgxQzIuNTE4LDIzLjIwNiw1LjQ3NCwyNi45NDcsNi45NDMsMjguNDUzeiIvPg0KPC9zdmc+DQo="
 };
 
-import {assert, fixture} from '@open-wc/testing';
-import {html} from "lit-element";
+import {assert, fixture, html} from '@open-wc/testing';
 import * as sinon from 'sinon';
 import {inputBasicTests} from "../../Et2InputWidget/test/InputBasicTests";
 import {Et2Select} from "../Et2Select";
diff --git a/api/js/etemplate/Et2Select/test/Et2SelectOptions.test.ts b/api/js/etemplate/Et2Select/test/Et2SelectOptions.test.ts
index 6bd952370a..00c5506a5b 100644
--- a/api/js/etemplate/Et2Select/test/Et2SelectOptions.test.ts
+++ b/api/js/etemplate/Et2Select/test/Et2SelectOptions.test.ts
@@ -1,5 +1,4 @@
-import {assert, elementUpdated, fixture} from '@open-wc/testing';
-import {html} from "lit-element";
+import {assert, elementUpdated, fixture, html} from '@open-wc/testing';
 import {Et2Box} from "../../Et2Box/Et2Box";
 import {Et2Select, SelectOption} from "../Et2Select";
 import * as sinon from "sinon";
diff --git a/api/js/etemplate/Et2Textbox/test/Et2Textbox.test.ts b/api/js/etemplate/Et2Textbox/test/Et2Textbox.test.ts
index 0c2e60568a..9091883da4 100644
--- a/api/js/etemplate/Et2Textbox/test/Et2Textbox.test.ts
+++ b/api/js/etemplate/Et2Textbox/test/Et2Textbox.test.ts
@@ -1,9 +1,8 @@
 /**
  * Test file for Etemplate webComponent Textbox
  */
-import {assert, fixture} from '@open-wc/testing';
+import {assert, fixture, html} from '@open-wc/testing';
 import {Et2Textbox} from "../Et2Textbox";
-import {html} from "lit-element";
 import {inputBasicTests} from "../../Et2InputWidget/test/InputBasicTests";
 
 // Reference to component under test
diff --git a/api/js/etemplate/Et2Textbox/test/Et2TextboxValues.test.ts b/api/js/etemplate/Et2Textbox/test/Et2TextboxValues.test.ts
index 33d463673e..3a2e773f50 100644
--- a/api/js/etemplate/Et2Textbox/test/Et2TextboxValues.test.ts
+++ b/api/js/etemplate/Et2Textbox/test/Et2TextboxValues.test.ts
@@ -2,8 +2,7 @@
  * Testing Et2Textbox input / values
  */
 
-import {assert, fixture} from "@open-wc/testing";
-import {html} from "lit-html";
+import {fixture, html} from "@open-wc/testing";
 import {Et2Textbox} from "../Et2Textbox";
 
 describe("Textbox input / values", () =>