diff --git a/test/test.gui_script b/test/test.gui_script
index 5ff46a0..54dcb74 100644
--- a/test/test.gui_script
+++ b/test/test.gui_script
@@ -1,15 +1,21 @@
-local luacov_runner = require "luacov.runner"
 local deftest = require("deftest.deftest")
 
+local tests = {
+	-- Test list
+	require("test.tests.test_button"),
+	require("test.tests.test_hover"),
+	require("test.tests.test_drag"),
+	require("test.tests.test_back_handler"),
+	require("test.tests.test_blocker"),
+	--require("test.tests.test_static_grid"),
+}
+
+
 function init(self)
 	print('[DefTest]: Init of DefTest')
-
-	luacov_runner.init()
-	deftest.add(require("test.tests.test_button"))
-	deftest.add(require("test.tests.test_hover"))
-	deftest.add(require("test.tests.test_drag"))
-	deftest.add(require("test.tests.test_back_handler"))
-	deftest.add(require("test.tests.test_blocker"))
+	for i = 1, #tests do
+		deftest.add(tests[i])
+	end
 
 	local is_report = (sys.get_config("test.report") == "1")
 	deftest.run({ coverage = { enabled = is_report } })
diff --git a/test/tests/test_back_handler.lua b/test/tests/test_back_handler.lua
index d9c5025..4fc517f 100644
--- a/test/tests/test_back_handler.lua
+++ b/test/tests/test_back_handler.lua
@@ -1,10 +1,10 @@
-local mock_gui = require "deftest.mock.gui"
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
 return function()
+	local mock_gui = require "deftest.mock.gui"
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 	describe("Back Handler component", function()
diff --git a/test/tests/test_blocker.lua b/test/tests/test_blocker.lua
index 1bc932d..8368a1f 100644
--- a/test/tests/test_blocker.lua
+++ b/test/tests/test_blocker.lua
@@ -1,11 +1,10 @@
-
-local mock_gui = require "deftest.mock.gui"
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
 return function()
+	local mock_gui = require "deftest.mock.gui"
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 	describe("Blocker component", function()
diff --git a/test/tests/test_button.lua b/test/tests/test_button.lua
index 2b7c23f..45101fb 100644
--- a/test/tests/test_button.lua
+++ b/test/tests/test_button.lua
@@ -1,11 +1,10 @@
-local mock_gui = require("deftest.mock.gui")
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
-
 return function()
+	local mock_gui = require("deftest.mock.gui")
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 	describe("Button Component", function()
diff --git a/test/tests/test_drag.lua b/test/tests/test_drag.lua
index 05c5ebf..d671484 100644
--- a/test/tests/test_drag.lua
+++ b/test/tests/test_drag.lua
@@ -1,10 +1,10 @@
-local mock_gui = require "deftest.mock.gui"
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
 return function()
+	local mock_gui = require "deftest.mock.gui"
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 
diff --git a/test/tests/test_hover.lua b/test/tests/test_hover.lua
index 1ad23fc..1f8ccee 100644
--- a/test/tests/test_hover.lua
+++ b/test/tests/test_hover.lua
@@ -1,10 +1,10 @@
-local mock_gui = require "deftest.mock.gui"
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
 return function()
+	local mock_gui = require "deftest.mock.gui"
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 	describe("Hover component", function()
diff --git a/test/tests/test_static_grid.lua b/test/tests/test_static_grid.lua
index 07ded13..6e67edb 100644
--- a/test/tests/test_static_grid.lua
+++ b/test/tests/test_static_grid.lua
@@ -1,10 +1,10 @@
-local mock_gui = require "deftest.mock.gui"
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
 return function()
+	local mock_gui = require "deftest.mock.gui"
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 	describe("Static Grid component", function()
diff --git a/test/tests/test_template.lua b/test/tests/test_template.lua
index 8d34c88..8793a92 100644
--- a/test/tests/test_template.lua
+++ b/test/tests/test_template.lua
@@ -1,10 +1,10 @@
-local mock_gui = require "deftest.mock.gui"
-local mock_time = require("deftest.mock.time")
-local mock_input = require("test.helper.mock_input")
-local test_helper = require("test.helper.test_helper")
-local druid_system = require("druid.druid")
-
 return function()
+	local mock_gui = require "deftest.mock.gui"
+	local mock_time = require("deftest.mock.time")
+	local mock_input = require("test.helper.mock_input")
+	local test_helper = require("test.helper.test_helper")
+	local druid_system = require("druid.druid")
+
 	local druid = nil
 	local context = test_helper.get_context()
 	describe("Template component", function()