diff --git a/README.md b/README.md
index 2aece71..1b80f52 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 WebDriver testing support for qooxdoo desktop and mobile applications.
 
-Version 1.0.7 is available on [NuGet](https://www.nuget.org/packages/Qooxdoo-WebDriver/) as __Qooxdoo-WebDriver__. This release is NET 4.5 only.
+Version 1.0.8 is available on [NuGet](https://www.nuget.org/packages/Qooxdoo-WebDriver/) as __Qooxdoo-WebDriver__. This release is NET 4.5 only.
 
 The SimpleDemo sample uses Chrome, Edge, Firefox and Opera (Internet Explorer isn't planned). It includes test projects for NUnit and MSTest. It also includes an "How to run.txt" to make your life easier.
 
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/ApiViewerTests.cs b/Samples/SimpleDemo/SimpleDemo.Tests/ApiViewerTests.cs
index 5797429..a700271 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/ApiViewerTests.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/ApiViewerTests.cs
@@ -7,12 +7,14 @@ namespace SimpleDemo.Tests
 {
     public static class ApiViewerTests
     {
-        public static void A01_ClickSearch(QxWebDriver driver)
+        public static QxWebDriver Driver;
+
+        public static void A01_ClickSearch()
         {
             // Find the 'Search' button in the tool bar
             // @label is the button text
             OpenQA.Selenium.By buttonByLabel = By.Qxh("apiviewer.Viewer/*/[@label=Search]");
-            IWidget buttonWidget = driver.FindWidget(buttonByLabel);
+            IWidget buttonWidget = Driver.FindWidget(buttonByLabel);
 
             // Click the button if it's not already selected
             if (!buttonWidget.Selected)
@@ -21,33 +23,33 @@ public static void A01_ClickSearch(QxWebDriver driver)
             }
         }
 
-        public static void A02_ClickLegend(QxWebDriver driver)
+        public static void A02_ClickLegend()
         {
             // Now click the 'Legend' button
             OpenQA.Selenium.By buttonByLabel = By.Qxh("apiviewer.Viewer/*/[@label=Legend]");
-            IWidget buttonWidget = driver.FindWidget(buttonByLabel);
+            IWidget buttonWidget = Driver.FindWidget(buttonByLabel);
             if (!buttonWidget.Selected)
             {
                 buttonWidget.Click();
             }
         }
 
-        public static void A03_ClickContent(QxWebDriver driver)
+        public static void A03_ClickContent()
         {
             // Now click the 'Content' button
             OpenQA.Selenium.By buttonByLabel = By.Qxh("apiviewer.Viewer/*/[@label=Content]");
-            IWidget buttonWidget = driver.FindWidget(buttonByLabel);
+            IWidget buttonWidget = Driver.FindWidget(buttonByLabel);
             if (!buttonWidget.Selected)
             {
                 buttonWidget.Click();
             }
         }
 
-        public static void A04_ClickTreeItem(QxWebDriver driver)
+        public static void A04_ClickTreeItem()
         {
             // Select the "data" item from the package tree
             OpenQA.Selenium.By tree = By.Qxh("apiviewer.Viewer/*/apiviewer.ui.PackageTree");
-            ISelectable packageTree = (ISelectable) driver.FindWidget(tree);
+            ISelectable packageTree = (ISelectable) Driver.FindWidget(tree);
             packageTree.SelectItem("data");
 
             Thread.Sleep(Wait.Duration);
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/ChromeApiViewer.cs b/Samples/SimpleDemo/SimpleDemo.Tests/ChromeApiViewer.cs
index 2c3be64..6362cba 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/ChromeApiViewer.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/ChromeApiViewer.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Chrome;
 using Qooxdoo.WebDriver;
 
 namespace SimpleDemo.Tests
@@ -9,16 +7,14 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class ChromeApiViewer
     {
-        private static IWebDriver _internalWebDriver;
-
         public static QxWebDriver Driver;
 
         [OneTimeSetUp]
         public void Setup()
         {
-            _internalWebDriver = new ChromeDriver();
-            _internalWebDriver.Manage().Window.Maximize();
-            Driver = new QxWebDriver(_internalWebDriver);
+            Driver = new QxWebDriver(Browser.Chrome);
+            Driver.Manage().Window.Maximize();
+            ApiViewerTests.Driver = Driver;
             Driver.Url = "http://www.qooxdoo.org/current/api/index.html";
         }
 
@@ -33,28 +29,28 @@ public void TearDown()
         [Order(1010)]
         public void A01_ClickSearch()
         {
-            ApiViewerTests.A01_ClickSearch(Driver);
+            ApiViewerTests.A01_ClickSearch();
         }
 
         [Test]
         [Order(1020)]
         public void A02_ClickLegend()
         {
-            ApiViewerTests.A02_ClickLegend(Driver);
+            ApiViewerTests.A02_ClickLegend();
         }
 
         [Test]
         [Order(1030)]
         public void A03_ClickContent()
         {
-            ApiViewerTests.A03_ClickContent(Driver);
+            ApiViewerTests.A03_ClickContent();
         }
 
         [Test]
         [Order(1040)]
         public void A04_ClickTreeItem()
         {
-            ApiViewerTests.A04_ClickTreeItem(Driver);
+            ApiViewerTests.A04_ClickTreeItem();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/ChromeWisej.cs b/Samples/SimpleDemo/SimpleDemo.Tests/ChromeWisej.cs
index b14602d..fedaa2e 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/ChromeWisej.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/ChromeWisej.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Support.UI;
 using Qooxdoo.WebDriver;
 
@@ -10,17 +8,15 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class ChromeWisej
     {
-        private static IWebDriver _internalWebDriver;
-
         public static QxWebDriver Driver;
 
         [OneTimeSetUp]
         public void Setup()
         {
-            _internalWebDriver = new ChromeDriver();
-            _internalWebDriver.Manage().Window.Maximize();
-            Driver = new QxWebDriver(_internalWebDriver);
+            Driver = new QxWebDriver(Browser.Chrome);
+            Driver.Manage().Window.Maximize();
             Cache.Clear();
+            WisejTests.Driver = Driver;
 #if !DEBUGJS
             Driver.Url = "http://localhost:16461/Default.html";
 #else
@@ -33,6 +29,7 @@ public void TearDown()
         {
             Driver.Quit();
             Driver.Dispose();
+            Driver = null;
         }
 
         [Test]
@@ -40,70 +37,70 @@ public void TearDown()
         public void W01_AskQuitNo()
         {
             ExpectedConditions.TitleIs("Main Page");
-            WisejTests.W01_AskQuitNo(Driver);
+            WisejTests.W01_AskQuitNo();
         }
 
         [Test]
         [Order(1060)]
         public void W02_MainPage_customerEditor_Click()
         {
-            WisejTests.W02_MainPage_customerEditor_Click(Driver);
+            WisejTests.W02_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(1070)]
         public void W03_ButtonsWindow_customerEditor_Click()
         {
-            WisejTests.W03_ButtonsWindow_customerEditor_Click(Driver);
+            WisejTests.W03_ButtonsWindow_customerEditor_Click();
         }
 
         [Test]
         [Order(1080)]
         public void W04_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W04_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W04_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(1090)]
         public void W05_CloseWindow()
         {
-            WisejTests.W05_CloseWindow(Driver);
+            WisejTests.W05_CloseWindow();
         }
 
         [Test]
         [Order(1100)]
         public void W06_MainPage_customerEditor_Click()
         {
-            WisejTests.W06_MainPage_customerEditor_Click(Driver);
+            WisejTests.W06_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(1110)]
         public void W07_ButtonsWindow_supplierEditor_Click()
         {
-            WisejTests.W07_ButtonsWindow_supplierEditor_Click(Driver);
+            WisejTests.W07_ButtonsWindow_supplierEditor_Click();
         }
 
         [Test]
         [Order(1120)]
         public void W08_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W08_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W08_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(1130)]
         public void W09_CloseWindow()
         {
-            WisejTests.W09_CloseWindow(Driver);
+            WisejTests.W09_CloseWindow();
         }
 
         [Test]
         [Order(1140)]
         public void W10_AskQuitYes()
         {
-            WisejTests.W10_AskQuitYes(Driver);
+            WisejTests.W10_AskQuitYes();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/EdgeApiViewer.cs b/Samples/SimpleDemo/SimpleDemo.Tests/EdgeApiViewer.cs
index 61d2233..9fa5634 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/EdgeApiViewer.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/EdgeApiViewer.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Edge;
 using Qooxdoo.WebDriver;
 
 namespace SimpleDemo.Tests
@@ -9,16 +7,14 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class EdgeApiViewer
     {
-        private static IWebDriver _internalWebDriver;
-
         public static QxWebDriver Driver;
 
         [OneTimeSetUp]
         public void Setup()
         {
-            _internalWebDriver = new EdgeDriver();
-            _internalWebDriver.Manage().Window.Maximize();
-            Driver = new QxWebDriver(_internalWebDriver);
+            Driver = new QxWebDriver(Browser.Edge);
+            Driver.Manage().Window.Maximize();
+            ApiViewerTests.Driver = Driver;
             Driver.Url = "http://www.qooxdoo.org/current/api/index.html";
         }
 
@@ -33,28 +29,28 @@ public void TearDown()
         [Order(2010)]
         public void A01_ClickSearch()
         {
-            ApiViewerTests.A01_ClickSearch(Driver);
+            ApiViewerTests.A01_ClickSearch();
         }
 
         [Test]
         [Order(2020)]
         public void A02_ClickLegend()
         {
-            ApiViewerTests.A02_ClickLegend(Driver);
+            ApiViewerTests.A02_ClickLegend();
         }
 
         [Test]
         [Order(2030)]
         public void A03_ClickContent()
         {
-            ApiViewerTests.A03_ClickContent(Driver);
+            ApiViewerTests.A03_ClickContent();
         }
 
         [Test]
         [Order(2040)]
         public void A04_ClickTreeItem()
         {
-            ApiViewerTests.A04_ClickTreeItem(Driver);
+            ApiViewerTests.A04_ClickTreeItem();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/EdgeWisej.cs b/Samples/SimpleDemo/SimpleDemo.Tests/EdgeWisej.cs
index 4673731..356390a 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/EdgeWisej.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/EdgeWisej.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Edge;
 using OpenQA.Selenium.Support.UI;
 using Qooxdoo.WebDriver;
 
@@ -10,17 +8,15 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class EdgeWisej
     {
-        private static IWebDriver _internalWebDriver;
-
         public static QxWebDriver Driver;
 
         [OneTimeSetUp]
         public void Setup()
         {
-            _internalWebDriver = new EdgeDriver();
-            _internalWebDriver.Manage().Window.Maximize();
-            Driver = new QxWebDriver(_internalWebDriver);
+            Driver = new QxWebDriver(Browser.Edge);
+            Driver.Manage().Window.Maximize();
             Cache.Clear();
+            WisejTests.Driver = Driver;
 #if !DEBUGJS
             Driver.Url = "http://localhost:16461/Default.html";
 #else
@@ -40,70 +36,70 @@ public void TearDown()
         public void W01_AskQuitNo()
         {
             ExpectedConditions.TitleIs("Main Page");
-            WisejTests.W01_AskQuitNo(Driver);
+            WisejTests.W01_AskQuitNo();
         }
 
         [Test]
         [Order(2060)]
         public void W02_MainPage_customerEditor_Click()
         {
-            WisejTests.W02_MainPage_customerEditor_Click(Driver);
+            WisejTests.W02_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(2070)]
         public void W03_ButtonsWindow_customerEditor_Click()
         {
-            WisejTests.W03_ButtonsWindow_customerEditor_Click(Driver);
+            WisejTests.W03_ButtonsWindow_customerEditor_Click();
         }
 
         [Test]
         [Order(2080)]
         public void W04_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W04_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W04_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(2090)]
         public void W05_CloseWindow()
         {
-            WisejTests.W05_CloseWindow(Driver);
+            WisejTests.W05_CloseWindow();
         }
 
         [Test]
         [Order(2100)]
         public void W06_MainPage_customerEditor_Click()
         {
-            WisejTests.W06_MainPage_customerEditor_Click(Driver);
+            WisejTests.W06_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(2110)]
         public void W07_ButtonsWindow_supplierEditor_Click()
         {
-            WisejTests.W07_ButtonsWindow_supplierEditor_Click(Driver);
+            WisejTests.W07_ButtonsWindow_supplierEditor_Click();
         }
 
         [Test]
         [Order(2120)]
         public void W08_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W08_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W08_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(2130)]
         public void W09_CloseWindow()
         {
-            WisejTests.W09_CloseWindow(Driver);
+            WisejTests.W09_CloseWindow();
         }
 
         [Test]
         [Order(2140)]
         public void W10_AskQuitYes()
         {
-            WisejTests.W10_AskQuitYes(Driver);
+            WisejTests.W10_AskQuitYes();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxApiViewer.cs b/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxApiViewer.cs
index b21709f..2c741dc 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxApiViewer.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxApiViewer.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Firefox;
 using Qooxdoo.WebDriver;
 
 namespace SimpleDemo.Tests
@@ -9,15 +7,14 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class FirefoxApiViewer
     {
-        private static IWebDriver _internalWebDriver;
-
         public static QxWebDriver Driver;
 
         [OneTimeSetUp]
         public void Setup()
         {
-            _internalWebDriver = new FirefoxDriver();
-            Driver = new QxWebDriver(_internalWebDriver);
+            Driver = new QxWebDriver(Browser.Firefox);
+            Driver.Manage().Window.Maximize();
+            ApiViewerTests.Driver = Driver;
             Driver.Url = "http://www.qooxdoo.org/current/api/index.html";
         }
 
@@ -32,28 +29,28 @@ public void TearDown()
         [Order(3010)]
         public void A01_ClickSearch()
         {
-            ApiViewerTests.A01_ClickSearch(Driver);
+            ApiViewerTests.A01_ClickSearch();
         }
 
         [Test]
         [Order(3020)]
         public void A02_ClickLegend()
         {
-            ApiViewerTests.A02_ClickLegend(Driver);
+            ApiViewerTests.A02_ClickLegend();
         }
 
         [Test]
         [Order(3030)]
         public void A03_ClickContent()
         {
-            ApiViewerTests.A03_ClickContent(Driver);
+            ApiViewerTests.A03_ClickContent();
         }
 
         [Test]
         [Order(3040)]
         public void A04_ClickTreeItem()
         {
-            ApiViewerTests.A04_ClickTreeItem(Driver);
+            ApiViewerTests.A04_ClickTreeItem();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxWisej.cs b/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxWisej.cs
index 96a477d..5b263f2 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxWisej.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/FirefoxWisej.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
-using OpenQA.Selenium.Firefox;
 using OpenQA.Selenium.Support.UI;
 using Qooxdoo.WebDriver;
 
@@ -10,16 +8,14 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class FirefoxWisej
     {
-        private static IWebDriver _internalWebDriver;
-
         public static QxWebDriver Driver;
 
         [OneTimeSetUp]
         public void Setup()
         {
-            _internalWebDriver = new FirefoxDriver();
-            Driver = new QxWebDriver(_internalWebDriver);
+            Driver = new QxWebDriver(Browser.Firefox);
             Cache.Clear();
+            WisejTests.Driver = Driver;
 #if !DEBUGJS
             Driver.Url = "http://localhost:16461/Default.html";
 #else
@@ -39,70 +35,70 @@ public void TearDown()
         public void W01_AskQuitNo()
         {
             ExpectedConditions.TitleIs("Main Page");
-            WisejTests.W01_AskQuitNo(Driver);
+            WisejTests.W01_AskQuitNo();
         }
 
         [Test]
         [Order(3060)]
         public void W02_MainPage_customerEditor_Click()
         {
-            WisejTests.W02_MainPage_customerEditor_Click(Driver);
+            WisejTests.W02_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(3070)]
         public void W03_ButtonsWindow_customerEditor_Click()
         {
-            WisejTests.W03_ButtonsWindow_customerEditor_Click(Driver);
+            WisejTests.W03_ButtonsWindow_customerEditor_Click();
         }
 
         [Test]
         [Order(3080)]
         public void W04_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W04_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W04_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(3090)]
         public void W05_CloseWindow()
         {
-            WisejTests.W05_CloseWindow(Driver);
+            WisejTests.W05_CloseWindow();
         }
 
         [Test]
         [Order(3100)]
         public void W06_MainPage_customerEditor_Click()
         {
-            WisejTests.W06_MainPage_customerEditor_Click(Driver);
+            WisejTests.W06_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(3110)]
         public void W07_ButtonsWindow_supplierEditor_Click()
         {
-            WisejTests.W07_ButtonsWindow_supplierEditor_Click(Driver);
+            WisejTests.W07_ButtonsWindow_supplierEditor_Click();
         }
 
         [Test]
         [Order(3120)]
         public void W08_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W08_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W08_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(3130)]
         public void W09_CloseWindow()
         {
-            WisejTests.W09_CloseWindow(Driver);
+            WisejTests.W09_CloseWindow();
         }
 
         [Test]
         [Order(3140)]
         public void W10_AskQuitYes()
         {
-            WisejTests.W10_AskQuitYes(Driver);
+            WisejTests.W10_AskQuitYes();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/OperaApiViewer.cs b/Samples/SimpleDemo/SimpleDemo.Tests/OperaApiViewer.cs
index 0fd0f4f..dd6d4b0 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/OperaApiViewer.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/OperaApiViewer.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
 using OpenQA.Selenium.Opera;
 using Qooxdoo.WebDriver;
 
@@ -9,9 +8,7 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class OperaApiViewer
     {
-        private static string _operaBinary = @"C:\Program Files (x86)\Opera\48.0.2685.39\opera.exe";
-
-        private static IWebDriver _internalWebDriver;
+        private const string OperaBinary = @"C:\Program Files (x86)\Opera\48.0.2685.39\opera.exe";
 
         public static QxWebDriver Driver;
 
@@ -19,10 +16,10 @@ public class OperaApiViewer
         public void Setup()
         {
             var options = new OperaOptions();
-            options.BinaryLocation = _operaBinary;
-            _internalWebDriver = new OperaDriver(options);
-            _internalWebDriver.Manage().Window.Maximize();
-            Driver = new QxWebDriver(_internalWebDriver);
+            options.BinaryLocation = OperaBinary;
+            Driver = new QxWebDriver(new OperaDriver(options));
+            Driver.Manage().Window.Maximize();
+            ApiViewerTests.Driver = Driver;
             Driver.Url = "http://www.qooxdoo.org/current/api/index.html";
         }
 
@@ -37,28 +34,28 @@ public void TearDown()
         [Order(5010)]
         public void A01_ClickSearch()
         {
-            ApiViewerTests.A01_ClickSearch(Driver);
+            ApiViewerTests.A01_ClickSearch();
         }
 
         [Test]
         [Order(5020)]
         public void A02_ClickLegend()
         {
-            ApiViewerTests.A02_ClickLegend(Driver);
+            ApiViewerTests.A02_ClickLegend();
         }
 
         [Test]
         [Order(5030)]
         public void A03_ClickContent()
         {
-            ApiViewerTests.A03_ClickContent(Driver);
+            ApiViewerTests.A03_ClickContent();
         }
 
         [Test]
         [Order(5040)]
         public void A04_ClickTreeItem()
         {
-            ApiViewerTests.A04_ClickTreeItem(Driver);
+            ApiViewerTests.A04_ClickTreeItem();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/OperaWisej.cs b/Samples/SimpleDemo/SimpleDemo.Tests/OperaWisej.cs
index 2ba8c26..ea90f3c 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/OperaWisej.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/OperaWisej.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using OpenQA.Selenium;
 using OpenQA.Selenium.Opera;
 using OpenQA.Selenium.Support.UI;
 using Qooxdoo.WebDriver;
@@ -10,9 +9,7 @@ namespace SimpleDemo.Tests
     [Parallelizable(ParallelScope.None)]
     public class OperaWisej
     {
-        private static string _operaBinary = @"C:\Program Files (x86)\Opera\48.0.2685.39\opera.exe";
-
-        private static IWebDriver _internalWebDriver;
+        private const string OperaBinary = @"C:\Program Files (x86)\Opera\48.0.2685.39\opera.exe";
 
         public static QxWebDriver Driver;
 
@@ -20,11 +17,11 @@ public class OperaWisej
         public void Setup()
         {
             var options = new OperaOptions();
-            options.BinaryLocation = _operaBinary;
-            _internalWebDriver = new OperaDriver(options);
-            _internalWebDriver.Manage().Window.Maximize();
-            Driver = new QxWebDriver(_internalWebDriver);
+            options.BinaryLocation = OperaBinary;
+            Driver = new QxWebDriver(new OperaDriver(options));
+            Driver.Manage().Window.Maximize();
             Cache.Clear();
+            WisejTests.Driver = Driver;
 #if !DEBUGJS
             Driver.Url = "http://localhost:16461/Default.html";
 #else
@@ -44,70 +41,70 @@ public void TearDown()
         public void W01_AskQuitNo()
         {
             ExpectedConditions.TitleIs("Main Page");
-            WisejTests.W01_AskQuitNo(Driver);
+            WisejTests.W01_AskQuitNo();
         }
 
         [Test]
         [Order(5060)]
         public void W02_MainPage_customerEditor_Click()
         {
-            WisejTests.W02_MainPage_customerEditor_Click(Driver);
+            WisejTests.W02_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(5070)]
         public void W03_ButtonsWindow_customerEditor_Click()
         {
-            WisejTests.W03_ButtonsWindow_customerEditor_Click(Driver);
+            WisejTests.W03_ButtonsWindow_customerEditor_Click();
         }
 
         [Test]
         [Order(5080)]
         public void W04_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W04_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W04_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(5090)]
         public void W05_CloseWindow()
         {
-            WisejTests.W05_CloseWindow(Driver);
+            WisejTests.W05_CloseWindow();
         }
 
         [Test]
         [Order(5100)]
         public void W06_MainPage_customerEditor_Click()
         {
-            WisejTests.W06_MainPage_customerEditor_Click(Driver);
+            WisejTests.W06_MainPage_customerEditor_Click();
         }
 
         [Test]
         [Order(5110)]
         public void W07_ButtonsWindow_supplierEditor_Click()
         {
-            WisejTests.W07_ButtonsWindow_supplierEditor_Click(Driver);
+            WisejTests.W07_ButtonsWindow_supplierEditor_Click();
         }
 
         [Test]
         [Order(5120)]
         public void W08_CustomerEditor_customerEditor_LabelContents()
         {
-            WisejTests.W08_CustomerEditor_customerEditor_LabelContents(Driver);
+            WisejTests.W08_CustomerEditor_customerEditor_LabelContents();
         }
 
         [Test]
         [Order(5130)]
         public void W09_CloseWindow()
         {
-            WisejTests.W09_CloseWindow(Driver);
+            WisejTests.W09_CloseWindow();
         }
 
         [Test]
         [Order(5140)]
         public void W10_AskQuitYes()
         {
-            WisejTests.W10_AskQuitYes(Driver);
+            WisejTests.W10_AskQuitYes();
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/SimpleDemo.Tests.csproj b/Samples/SimpleDemo/SimpleDemo.Tests/SimpleDemo.Tests.csproj
index b858a7c..e60c7eb 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/SimpleDemo.Tests.csproj
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/SimpleDemo.Tests.csproj
@@ -41,8 +41,8 @@
       <HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Qooxdoo.WebDriver, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Qooxdoo-WebDriver.1.0.7\lib\net45\Qooxdoo.WebDriver.dll</HintPath>
+    <Reference Include="Qooxdoo.WebDriver, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Qooxdoo-WebDriver.1.0.8\lib\net45\Qooxdoo.WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/Utils.cs b/Samples/SimpleDemo/SimpleDemo.Tests/Utils.cs
index 9292b25..cc68b24 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/Utils.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/Utils.cs
@@ -149,7 +149,6 @@ public static void LabelAssertValue(this QxWebDriver driver, string labelPath, s
         {
             var labelWidget = driver.LabelGet(labelPath, timeoutInSeconds);
             LabelAssertValueCore(labelWidget, labelPath, value);
-            ;
         }
 
         public static void LabelAssertValue(this IWidget rootWidget, string labelPath, string value,
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/WisejTests.cs b/Samples/SimpleDemo/SimpleDemo.Tests/WisejTests.cs
index 6d22019..445c250 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/WisejTests.cs
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/WisejTests.cs
@@ -8,19 +8,21 @@ namespace SimpleDemo.Tests
 {
     public static class WisejTests
     {
-        public static void W01_AskQuitNo(QxWebDriver driver)
+        public static QxWebDriver Driver;
+
+        public static void W01_AskQuitNo()
         {
             // get MainPage
-            IWidget mainPage = driver.WidgetGet("MainPage", "Page", 10);
+            IWidget mainPage = Driver.WidgetGet("MainPage", "Page", 10);
             // cache MainPage
             Cache.SetWidget("MainPage", mainPage);
 
             // click sayGoodBye on MainPage
             mainPage.ButtonClick("sayGoodBye", 10);
-            driver.MessageBoxClick(DialogResult.No);
+            Driver.MessageBoxClick(DialogResult.No);
         }
 
-        public static void W02_MainPage_customerEditor_Click(QxWebDriver driver)
+        public static void W02_MainPage_customerEditor_Click()
         {
             // get MainPage from cache
             IWidget mainPage = Cache.GetWidget("MainPage");
@@ -28,12 +30,12 @@ public static void W02_MainPage_customerEditor_Click(QxWebDriver driver)
             mainPage.ButtonClick("buttonsWindow");
 
             // check ButtonsWindow exists
-            IWidget buttonsWindow = driver.WidgetGet("ButtonsWindow", "Window", 10);
+            IWidget buttonsWindow = Driver.WidgetGet("ButtonsWindow", "Window", 10);
             // cache buttonsWindow
             Cache.SetWidget("ButtonsWindow", buttonsWindow);
         }
 
-        public static void W03_ButtonsWindow_customerEditor_Click(QxWebDriver driver)
+        public static void W03_ButtonsWindow_customerEditor_Click()
         {
             // get ButtonsWindow from cache
             IWidget buttonsWindow = Cache.GetWidget("ButtonsWindow");
@@ -43,18 +45,18 @@ public static void W03_ButtonsWindow_customerEditor_Click(QxWebDriver driver)
             buttonsPanel.ButtonClick("customerEditor");
 
             // check CustomerEditor exists
-            IWidget customerEditor = driver.WidgetGet("CustomerEditor", "Window", 10);
+            IWidget customerEditor = Driver.WidgetGet("CustomerEditor", "Window", 10);
             // cache buttonsWindow
             Cache.SetWidget("CustomerEditor", customerEditor);
         }
 
-        public static void W04_CustomerEditor_customerEditor_LabelContents(QxWebDriver driver)
+        public static void W04_CustomerEditor_customerEditor_LabelContents()
         {
             // get CustomerEditor from cache
             IWidget customerEditor = Cache.GetWidget("CustomerEditor");
         }
 
-        public static void W05_CloseWindow(QxWebDriver driver)
+        public static void W05_CloseWindow()
         {
             // give enough time so YOU can see the open window
             Thread.Sleep(Wait.Duration);
@@ -75,36 +77,36 @@ public static void W05_CloseWindow(QxWebDriver driver)
             Thread.Sleep(Wait.Duration);
         }
 
-        public static void W06_MainPage_customerEditor_Click(QxWebDriver driver)
+        public static void W06_MainPage_customerEditor_Click()
         {
             // no cache here
 
-            driver.ButtonClick("MainPage.buttonsWindow");
+            Driver.ButtonClick("MainPage.buttonsWindow");
 
-            var widget = driver.WaitForWidget(OpenQA.Selenium.By.Name("ButtonsWindow"), 10);
+            var widget = Driver.WaitForWidget(OpenQA.Selenium.By.Name("ButtonsWindow"), 10);
             Assert.IsNotNull(widget);
         }
 
-        public static void W07_ButtonsWindow_supplierEditor_Click(QxWebDriver driver)
+        public static void W07_ButtonsWindow_supplierEditor_Click()
         {
             // no cache here
 
             // click supplierEditor on buttonsPanel (LayoutPanel) of ButtonsWindow
-            driver.ButtonClick("ButtonsWindow.buttonsPanel.supplierEditor");
+            Driver.ButtonClick("ButtonsWindow.buttonsPanel.supplierEditor");
 
-            driver.AlertBoxClose(MessageBoxIcon.Error, "Supplier Editor must be implemented");
-            driver.AlertBoxClose("Supplier Editor should be implemented");
-            driver.AlertBoxClose(MessageBoxIcon.Information);
+            Driver.AlertBoxClose(MessageBoxIcon.Error, "Supplier Editor must be implemented");
+            Driver.AlertBoxClose("Supplier Editor should be implemented");
+            Driver.AlertBoxClose(MessageBoxIcon.Information);
         }
 
-        public static void W08_CustomerEditor_customerEditor_LabelContents(QxWebDriver driver)
+        public static void W08_CustomerEditor_customerEditor_LabelContents()
         {
             // no cache here
 
             //driver.LabelAssertValue("CustomerEditor.label1", "End of windows");
         }
 
-        public static void W09_CloseWindow(QxWebDriver driver)
+        public static void W09_CloseWindow()
         {
             // no cache here
 
@@ -116,18 +118,18 @@ public static void W09_CloseWindow(QxWebDriver driver)
             // give enough time so YOU can follow the windows closing
             Thread.Sleep(Wait.Duration);
 
-            driver.WindowClose("ButtonsWindow");
+            Driver.WindowClose("ButtonsWindow");
 
             // give enough time so YOU can see all windows are closed
             Thread.Sleep(Wait.Duration);
         }
 
-        public static void W10_AskQuitYes(QxWebDriver driver)
+        public static void W10_AskQuitYes()
         {
             // no cache here
 
-            driver.ButtonClick("MainPage.sayGoodBye");
-            driver.MessageBoxClick(DialogResult.Yes);
+            Driver.ButtonClick("MainPage.sayGoodBye");
+            Driver.MessageBoxClick(DialogResult.Yes);
 
             // give enough time so YOU can see the root Page before the browser shows an empty screen
             Thread.Sleep(Wait.Duration * 2);
diff --git a/Samples/SimpleDemo/SimpleDemo.Tests/packages.config b/Samples/SimpleDemo/SimpleDemo.Tests/packages.config
index 77056f1..0ee5bbf 100644
--- a/Samples/SimpleDemo/SimpleDemo.Tests/packages.config
+++ b/Samples/SimpleDemo/SimpleDemo.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="NUnit" version="3.8.1" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.8.0" targetFramework="net45" />
-  <package id="Qooxdoo-WebDriver" version="1.0.7" targetFramework="net45" />
+  <package id="Qooxdoo-WebDriver" version="1.0.8" targetFramework="net45" />
   <package id="Selenium.Chrome.WebDriver" version="2.33" targetFramework="net45" />
   <package id="Selenium.Firefox.WebDriver" version="0.19.0" targetFramework="net45" />
   <package id="Selenium.Support" version="3.6.0" targetFramework="net45" />