Repository: alttester/AltTester-Unity-SDK (language: python)

Issue:
webgl logs documentation



Discussion / hints:

Fix patch:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index fd7085ba1..5d601909b 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,7 +1,6 @@
 name: Push
-on:
-  push:
-  workflow_dispatch:
+
+on: [push, workflow_dispatch]
 
 concurrency:
   group: build-${{ github.event.pull_request.number || github.ref }}
@@ -42,9 +41,10 @@ jobs:
         - uses: actions/checkout@v3
 
         - run: |
-            $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit
+            export PROXY_PORT=13010
+            export PROXY_HOST="127.0.0.1"
+            $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit
 
-        - run: ls
         - uses: actions/upload-artifact@v3.1.0
           if: always() # run this step even if one of the previous step failed
           with:
@@ -62,10 +62,18 @@ jobs:
         with:
           name:
             BuildMacArtifact
+
       - run: |
-          chmod -R 755  sampleGame.app
+          export PROXY_PORT=13010
+          export PROXY_HOST="127.0.0.1"
+          chmod -R 755 sampleGame.app
           open sampleGame.app
-          $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor  -logFile csharpAndroidTests.log -quit
+
+      - run: |
+          export PROXY_PORT=13010
+          export PROXY_HOST="127.0.0.1"
+          $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor  -logFile csharpAndroidTests.log -quit
+
       #TODO add back -reportPath $CI_PROJECT_DIR/reportTest.xml for removing because it's giving me unauthorized error
       - uses: actions/upload-artifact@v3.1.0
         if: always() # run this step even if one of the previous step failed
@@ -74,7 +82,7 @@ jobs:
           path: |
             *.log
             reportTest.xml
-            
+
   test-DotNet:
       runs-on: [self-hosted, macOS]
       needs: build-macOS
@@ -82,11 +90,14 @@ jobs:
         - uses: actions/checkout@v3
         - uses: actions/download-artifact@v3.0.0
           with:
-            name: 
+            name:
               BuildMacArtifact
         - name: Setup .NET Core SDK
           uses: actions/setup-dotnet@v2.1.1
         - run: |
+            export PROXY_PORT=13010
+            echo $PROXY_PORT
+            export PROXY_HOST="127.0.0.1"
             chmod -R 755  sampleGame.app
             open sampleGame.app
             dotnet test Bindings~/dotnet/AltDriver.Tests/AltDriver.Tests.csproj --logger:"console;verbosity=detailed"
@@ -97,55 +108,56 @@ jobs:
             name: TestCSharpArtifact
             path: |
               *.log
-  
-  test-Python:
-      runs-on: [self-hosted, macOS]
-      needs: build-macOS
-      steps:
-        - uses: actions/checkout@v3
 
-        - uses: actions/download-artifact@v3.0.0
-          with:
-            name:
-              BuildMacArtifact
+  test-Python:
+    runs-on: [self-hosted, macOS]
+    needs: build-macOS
+    steps:
+      - uses: actions/checkout@v3
 
-        - uses: actions/setup-python@v4
-          with:
-            python-version: '3.10'
-            cached: 'pip'
+      - uses: actions/download-artifact@v3.0.0
+        with:
+          name:
+            BuildMacArtifact
 
-        - uses: syphar/restore-virtualenv@v1
-          id: cache-virtualenv
+      - name: Open application
+        run: |
+          export PROXY_PORT=13010
+          export PROXY_HOST="127.0.0.1"
+          chmod -R 755 sampleGame.app
+          open sampleGame.app
 
-        - uses: syphar/restore-pip-download-cache@v1
-          if: steps.cache-virtualenv.outputs.cache-hit != 'true'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
 
-        - name: Install dependencies
-          run: |
-            pip install -r "Bindings~/python/requirements.txt"
-            pip install -r "Bindings~/python/requirements-dev.txt"
-            pip install --ignore-installed  -e "Bindings~/python" --root "Bindings~/python"
+      - name: Install dependencies
+        run: |
+          pip install --upgrade pip setuptools wheel
+          pip uninstall AltTester-Driver
+          pip install -r "Bindings~/python/requirements.txt"
+          pip install -r "Bindings~/python/requirements-dev.txt"
+          pip install -e "Bindings~/python" --root "Bindings~/python"
 
-        - name: Lint with flake8
-          run: |
-            flake8 Bindings~/python/tests --config Bindings~/python/.flake8
+      - name: Lint with flake8
+        run: |
+          flake8 Bindings~/python/ --config Bindings~/python/.flake8
 
-        - name: Run unit tests
-          run: |
-            pytest Bindings~/python/tests/unit
+      - name: Run unit tests
+        run: |
+          pytest Bindings~/python/tests/unit
 
-        - name: Run integration tests
-          run: |
-            chmod -R 755 sampleGame.app
-            open sampleGame.app
-            pytest Bindings~/python/tests/integration
+      - name: Run integration tests
+        run: |
+          export PROXY_PORT=13010
+          export PROXY_HOST="127.0.0.1"
+          pytest Bindings~/python/tests/integration
 
-        - uses: actions/upload-artifact@v3.1.0
-          if: always() # run this step even if one of the previous step failed
-          with:
-            name: TestPythonArtifact
-            path: |
-              *.log
+      - uses: actions/upload-artifact@v3.1.0
+        if: always() # run this step even if one of the previous step failed
+        with:
+          name: TestPythonArtifact
+          path: "**/*.log"
 
   test-Java:
       runs-on: [self-hosted, macOS]
@@ -154,9 +166,9 @@ jobs:
         - uses: actions/checkout@v3
         - uses: actions/download-artifact@v3.0.0
           with:
-            name: 
+            name:
               BuildMacArtifact
-              
+
         - name: Setup Java JDK
           uses: actions/setup-java@v3.5.1
           with:
@@ -164,6 +176,9 @@ jobs:
               java-version: 11
         - uses: stCarolas/setup-maven@v4.4
         - run: |
+            export PROXY_PORT=13010
+            echo $PROXY_PORT
+            export PROXY_HOST="127.0.0.1"
             chmod -R 755  sampleGame.app
             open sampleGame.app
             cd "Bindings~/java"
@@ -175,7 +190,7 @@ jobs:
             name: TestJavaArtifact
             path: |
               *.log
-              
+
   dev-docs:
     runs-on: [self-hosted, macOS]
     needs: build-docs
@@ -195,4 +210,4 @@ jobs:
           port: ${{ secrets.PORT_DEV_ALTOM }}
           username: ${{ secrets.USERNAME_ALTOM }}
           password: ${{ secrets.PASSWORD_DEV_ALTOM }}
-          rmRemote: true
\ No newline at end of file
+          rmRemote: true
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c333d6027..ad5ef271c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,6 @@
   - adb uninstall fi.altom.altunitytester || true
   - adb install sampleGame.apk
   - adb shell am start -n fi.altom.altunitytester/com.unity3d.player.UnityPlayerActivity
-  - adb forward --remove-all
-  - adb forward tcp:13000 tcp:13000
 
 .install_python_dependencies: &install_python_dependencies
   - pip install --upgrade pip
@@ -46,14 +44,15 @@ build-docs:
     - when: never
   script:
     - cd Docs
+    - python3 -m venv altunity-docs
+    - source altunity-docs/bin/activate
     - pip install --upgrade pip
     - pip install --upgrade setuptools wheel
     - pip install -r requirements.txt
-    - pip freeze
-    - ./make.bat clean
-    - ./make.bat linkcheck
-    - ./make.bat clean
-    - ./make.bat html
+    - make clean
+    - make linkcheck
+    - make clean
+    - make html
     - cp -r build/html ../docs-html
   artifacts:
     when: always
@@ -133,7 +132,8 @@ build-apk:
       when: never
     - when: always
   variables:
-    ALTTESTER_PORT: 13000
+    PROXY_HOST: "192.168.11.35"
+    PROXY_PORT: 13010
   script:
     - whoami
     - adb uninstall fi.altom.altunitytester || true
@@ -208,8 +208,8 @@ unity-android-tests:
       when: never
     - when: always
   variables:
-    ALTDRIVER_PORT: 13000
-    ALTDRIVER_HOST: "127.0.0.1"
+    ALTUNITYDRIVER_PORT: 13010
+    ALTUNITYDRIVER_HOST: "127.0.0.1"
   before_script:
     - *reinstall_and_start_android_app
   script:
@@ -217,7 +217,6 @@ unity-android-tests:
   after_script:
     - cat csharpAndroidTests.log
     - adb pull /storage/emulated/0/Android/data/fi.altom.altunitytester/files/AltUnityServerLog.txt ./
-    - adb forward --remove-all
   artifacts:
     when: always
     expire_in: 10 days
@@ -242,11 +241,9 @@ unity-android-tests:
     - when: always
   script:
     - cd sampleGame
-    - iproxy 13000 13000 &
     - xcodebuild test-without-building -destination 'platform=iOS,name=iPhone' -scheme Unity-iPhone -allowProvisioningUpdates &
     - sleep 60
-    - ${UNITY_2021_3_HOME:-/Applications/Unity/Hub/Editor/2019.2.0f1/Unity.app/Contents/MacOS/Unity} -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltUnityTesterEditor.AltUnityTestRunner.RunTestFromCommandLine -testsAssembly Assembly-CSharp-Editor -logFile csharpIosTests.log -quit
-    - killall iproxy || true
+    - ${UNITY_2021_3_HOME:-/Applications/Unity/Hub/Editor/2019.2.0f1/Unity.app/Contents/MacOS/Unity} -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltUnityTesterEditor.AltUnityTestRunner.RunTestFromCommandLine -logFile csharpIosTests.log -quit
     - killall xcodebuild || true
   artifacts:
     when: always
@@ -271,15 +268,14 @@ dotnet-android-tests:
       when: never
     - when: always
   variables:
-    ALTDRIVER_PORT: 13000
-    ALTDRIVER_HOST: "127.0.0.1"
+    ALTUNITYDRIVER_PORT: 13010
+    ALTUNITYDRIVER_HOST: "127.0.0.1"
   before_script:
     - *reinstall_and_start_android_app
   script:
     - dotnet test Bindings~/dotnet/AltUnityDriver.Tests/AltUnityDriver.Tests.csproj --logger:"console;verbosity=detailed"
   after_script:
     - adb pull /storage/emulated/0/Android/data/fi.altom.altunitytester/files/AltUnityServerLog.txt ./
-    - adb forward --remove-all
   artifacts:
     when: always
     expire_in: 10 days
@@ -338,8 +334,8 @@ python-android-tests:
       when: never
     - when: always
   variables:
-    ALTDRIVER_PORT: 13000
-    ALTDRIVER_HOST: "127.0.0.1"
+    ALTUNITYDRIVER_PORT: 13010
+    ALTUNITYDRIVER_HOST: "127.0.0.1"
   before_script:
     - *reinstall_and_start_android_app
     - python3 -m venv altunity-tests
@@ -349,7 +345,6 @@ python-android-tests:
     - pytest Bindings~/python/tests/integration -x
   after_script:
     - adb pull /storage/emulated/0/Android/data/fi.altom.altunitytester/files/AltUnityServerLog.txt ./
-    - adb forward --remove-all
   artifacts:
     when: always
     expire_in: 10 days
@@ -372,8 +367,8 @@ java-android-tests:
       when: never
     - when: always
   variables:
-    ALTDRIVER_PORT: 13000
-    ALTDRIVER_HOST: "127.0.0.1"
+    ALTUNITYDRIVER_PORT: 13010
+    ALTUNITYDRIVER_HOST: "127.0.0.1"
   before_script:
     - *reinstall_and_start_android_app
   script:
@@ -381,7 +376,6 @@ java-android-tests:
     - mvn -Dtest=ro.altom.altunitytester.Tests* test
   after_script:
     - adb pull /storage/emulated/0/Android/data/fi.altom.altunitytester/files/AltUnityServerLog.txt ./
-    - adb forward --remove-all
   artifacts:
     when: always
     expire_in: 10 days
diff --git a/Assets/AltTester/3rdParty/websocket-sharp/netstandard2.0/altwebsocket-sharp.deps.json.meta b/Assets/AltTester/3rdParty/websocket-sharp/netstandard2.0/altwebsocket-sharp.deps.json.meta
deleted file mode 100644
index efb381174..000000000
--- a/Assets/AltTester/3rdParty/websocket-sharp/netstandard2.0/altwebsocket-sharp.deps.json.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: be271e40db44e8c4dbdb434ab6884156
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/AltTester/AltDriver/AltDevice.cs b/Assets/AltTester/AltDriver/AltDevice.cs
index 517810983..ff7c11d50 100644
--- a/Assets/AltTester/AltDriver/AltDevice.cs
+++ b/Assets/AltTester/AltDriver/AltDevice.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public class AltDevice
     {
@@ -8,7 +8,7 @@ public class AltDevice
         public bool Active { get; set; }
         public string Platform { get; set; }
         public int Pid { get; set; }
-        
+
         public AltDevice(string deviceId, string platform, int localPort = 13000, int remotePort = 13000, bool active = false, int pid = 0)
         {
             DeviceId = deviceId;
diff --git a/Assets/AltTester/AltDriver/AltDriver.cs b/Assets/AltTester/AltDriver/AltDriver.cs
index 29899fff8..a68546dd3 100644
--- a/Assets/AltTester/AltDriver/AltDriver.cs
+++ b/Assets/AltTester/AltDriver/AltDriver.cs
@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using Altom.AltDriver.Commands;
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.Notifications;
+using AltTester.AltDriver.Commands;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Notifications;
 
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public enum By
     {
@@ -27,7 +28,7 @@ public class AltDriver
         /// <param name="port">The port AltProxy is listening on.</param>
         /// <param name="enableLogging">If true it enables driver commands logging to log file and Unity.</param>
         /// <param name="connectTimeout">The connect timeout in seconds.</param>
-        public AltDriver(string host = "127.0.0.1", int port = 13000, bool enableLogging = false, int connectTimeout = 60)
+        public AltDriver(string host = "127.0.0.1", int port = 13000, bool enableLogging = false, int connectTimeout = 60, string gameName = "__default__")
         {
 #if UNITY_EDITOR || ALTTESTER
             var defaultLevels = new Dictionary<AltLogger, AltLogLevel> { { AltLogger.File, AltLogLevel.Debug }, { AltLogger.Unity, AltLogLevel.Debug } };
@@ -38,9 +39,17 @@ public AltDriver(string host = "127.0.0.1", int port = 13000, bool enableLogging
             DriverLogManager.SetupAltDriverLogging(defaultLevels);
 
             if (!enableLogging)
+            {
                 DriverLogManager.StopLogging();
+            }
 
-            communicationHandler = new DriverCommunicationWebSocket(host, port, connectTimeout);
+            logger.Debug(
+                "Connecting to AltTester on host: '{0}', port: '{1}' and gameName: '{2}'.",
+                host,
+                port,
+                gameName
+            );
+            communicationHandler = new DriverCommunicationWebSocket(host, port, connectTimeout, gameName);
             communicationHandler.Connect();
 
             checkServerVersion();
diff --git a/Assets/AltTester/AltDriver/AltErrors.cs b/Assets/AltTester/AltDriver/AltErrors.cs
index 546d59409..3655f0152 100644
--- a/Assets/AltTester/AltDriver/AltErrors.cs
+++ b/Assets/AltTester/AltDriver/AltErrors.cs
@@ -1,8 +1,8 @@
 ﻿
 using System;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public class AltErrors
     {
diff --git a/Assets/AltTester/AltDriver/AltPortForwarding.cs b/Assets/AltTester/AltDriver/AltPortForwarding.cs
index 5080d8765..84a16c147 100644
--- a/Assets/AltTester/AltDriver/AltPortForwarding.cs
+++ b/Assets/AltTester/AltDriver/AltPortForwarding.cs
@@ -3,9 +3,9 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     /// <summary>
     /// API to interact with adb, iproxy and xcrun programatically
diff --git a/Assets/AltTester/AltDriver/Commands/AltBaseCommand.cs b/Assets/AltTester/AltDriver/Commands/AltBaseCommand.cs
index 01f1f6c19..3bc204177 100644
--- a/Assets/AltTester/AltDriver/Commands/AltBaseCommand.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltBaseCommand.cs
@@ -1,7 +1,7 @@
 using System;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltCommandReturningAltElement.cs b/Assets/AltTester/AltDriver/Commands/AltCommandReturningAltElement.cs
index 300729e2d..851ed2d2a 100644
--- a/Assets/AltTester/AltDriver/Commands/AltCommandReturningAltElement.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltCommandReturningAltElement.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltCommandReturningAltElement : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs
index 0c96f2c4e..6845a8de5 100644
--- a/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltCommands/AddNotificationListener.cs
@@ -1,7 +1,7 @@
 using System;
-using Altom.AltDriver.Notifications;
+using AltTester.AltDriver.Notifications;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AddNotificationListener<T> : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/AltGetServerVersion.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/AltGetServerVersion.cs
index 472242392..5bdfc402e 100644
--- a/Assets/AltTester/AltDriver/Commands/AltCommands/AltGetServerVersion.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltCommands/AltGetServerVersion.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetServerVersion : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/AltResetInput.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/AltResetInput.cs
index 478fe2627..ab10cee9c 100644
--- a/Assets/AltTester/AltDriver/Commands/AltCommands/AltResetInput.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltCommands/AltResetInput.cs
@@ -1,3 +1,5 @@
+using AltTester.AltDriver.Commands;
+
 namespace Altom.AltDriver.Commands
 {
     public class AltResetInput : AltBaseCommand
diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs
index 8eb63b79b..f5d93ce53 100644
--- a/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltCommands/AltSetServerLogging.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltSetServerLogging : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs b/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs
index e22cd77ac..fd3695d82 100644
--- a/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltCommands/RemoveNotificationListener.cs
@@ -1,7 +1,7 @@
 using System;
-using Altom.AltDriver.Notifications;
+using AltTester.AltDriver.Notifications;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class RemoveNotificationListener : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltGetStaticProperty.cs b/Assets/AltTester/AltDriver/Commands/AltGetStaticProperty.cs
index 0c6ee6db7..3bf5a7a2d 100644
--- a/Assets/AltTester/AltDriver/Commands/AltGetStaticProperty.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltGetStaticProperty.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetStaticProperty<T> : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/AltSetStaticProperty.cs b/Assets/AltTester/AltDriver/Commands/AltSetStaticProperty.cs
index aec80479e..c7265e60e 100644
--- a/Assets/AltTester/AltDriver/Commands/AltSetStaticProperty.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltSetStaticProperty.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using AltTester.AltDriver.Commands;
 
 namespace Altom.AltDriver.Commands
 {
diff --git a/Assets/AltTester/AltDriver/Commands/AltWebSocketClient.cs b/Assets/AltTester/AltDriver/Commands/AltWebSocketClient.cs
index 9b1201688..f27245194 100644
--- a/Assets/AltTester/AltDriver/Commands/AltWebSocketClient.cs
+++ b/Assets/AltTester/AltDriver/Commands/AltWebSocketClient.cs
@@ -1,7 +1,7 @@
 using System;
 using AltWebSocketSharp;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltWebSocketClient : IWebSocketClient
     {
diff --git a/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs b/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs
index c7fdb783c..93fb36c2d 100644
--- a/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs
+++ b/Assets/AltTester/AltDriver/Commands/DriverCommunicationWebSocket.cs
@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.Security.Permissions;
 using System.Threading;
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.Notifications;
-using AltWebSocketSharp;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Notifications;
 using Newtonsoft.Json;
+using AltWebSocketSharp;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class DriverCommunicationWebSocket : IDriverCommunication
     {
@@ -18,6 +17,7 @@ public class DriverCommunicationWebSocket : IDriverCommunication
         private readonly string _host;
         private readonly int _port;
         private readonly string _uri;
+        private readonly string _gameName;
         private readonly int _connectTimeout;
         private Queue<CommandResponse> messages;
         private List<Action<AltLoadSceneNotificationResultParams>> loadSceneCallbacks = new List<Action<AltLoadSceneNotificationResultParams>>();
@@ -29,11 +29,13 @@ public class DriverCommunicationWebSocket : IDriverCommunication
         private int commandTimeout = 60;
         private float delayAfterCommand = 0;
 
-        public DriverCommunicationWebSocket(string host, int port, int connectTimeout)
+        public DriverCommunicationWebSocket(string host, int port, int connectTimeout, string gameName)
         {
             _host = host;
             _port = port;
-            _uri = "ws://" + host + ":" + port + "/altws";
+            _gameName = gameName;
+
+            _uri = "ws://" + host + ":" + port + "/altws?game=" + Uri.EscapeUriString(gameName);
             _connectTimeout = connectTimeout;
 
             messages = new Queue<CommandResponse>();
@@ -43,7 +45,7 @@ public void Connect()
         {
             int delay = 100;
 
-            logger.Info("Connecting to host: {0} port: {1}.", _host, _port);
+            logger.Info("Connecting to: '{0}'.", _uri);
 
             WebSocket wsClient = new WebSocket(_uri);
             wsClient.OnError += (sender, args) =>
@@ -56,7 +58,10 @@ public void Connect()
 
             while (_connectTimeout > watch.Elapsed.TotalSeconds)
             {
-                if (retries > 0) logger.Debug(string.Format("Retrying #{0} to host: {1} port: {2}.", retries, _host, _port));
+                if (retries > 0)
+                {
+                    logger.Debug(string.Format("Retrying #{0} to connect to: '{1}'.", retries, _uri));
+                }
                 wsClient.Connect();
 
                 if (wsClient.IsAlive) break;
@@ -131,7 +136,6 @@ public T Recvall<T>(CommandParams param)
             }
         }
 
-
         public void Send(CommandParams param)
         {
             param.messageId = DateTimeOffset.Now.ToUnixTimeMilliseconds().ToString();
@@ -149,6 +153,7 @@ public void Close()
             logger.Info(string.Format("Closing connection to AltTester on: {0}", _uri));
             this.wsClient.Close();
         }
+
         public void SetCommandTimeout(int timeout)
         {
             commandTimeout = timeout;
@@ -167,7 +172,6 @@ protected void OnMessage(object sender, string data)
                 messages.Enqueue(message);
                 logger.Debug("response received: " + trimLog(data));
             }
-
         }
 
         private void handleNotification(CommandResponse message)
@@ -261,6 +265,7 @@ private void handleErrors(CommandError error)
             logger.Debug(error.type + " is not handled by driver.");
             throw new UnknownErrorException(error.message);
         }
+
         private string trimLog(string log, int maxLogLength = 1000)
         {
             if (string.IsNullOrEmpty(log)) return log;
@@ -329,6 +334,7 @@ public void RemoveNotificationListener(NotificationType notificationType)
                     break;
             }
         }
+
         public void SetDelayAfterCommand(float delay)
         {
             delayAfterCommand = delay;
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltBaseFindObjects.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltBaseFindObjects.cs
index c16f1229f..70b1cb586 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltBaseFindObjects.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltBaseFindObjects.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltBaseFindObjects : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObject.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObject.cs
index 5d9c31c86..94c195051 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObject.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltFindObject : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectAtCoordinates.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectAtCoordinates.cs
index 1946533b1..9b8ee759a 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectAtCoordinates.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectAtCoordinates.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltFindObjectAtCoordinates : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectWhichContains.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectWhichContains.cs
index 8baf0c762..0a20c4e0d 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectWhichContains.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectWhichContains.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltDriver.Commands
+﻿namespace AltTester.AltDriver.Commands
 {
     public class AltFindObjectWhichContains : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjects.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjects.cs
index 8dfe6f23c..f9ef68f49 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjects.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjects.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltFindObjects : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs
index 72976a792..911bcf700 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltFindObjectsWhichContain.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltFindObjectsWhichContain : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElements.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElements.cs
index 19fb76941..ac929819e 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElements.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElements.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllElements : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElementsLight.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElementsLight.cs
index 521c4f909..a0fed217b 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElementsLight.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllElementsLight.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllElementsLight : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllLoadedScenesAndObjects.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllLoadedScenesAndObjects.cs
index 047ea3842..85d2390fd 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllLoadedScenesAndObjects.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltGetAllLoadedScenesAndObjects.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllLoadedScenesAndObjects : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObject.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObject.cs
index 818fd695d..ed67594e2 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObject.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltWaitForObject : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectNotBePresent.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectNotBePresent.cs
index 6d8c526bd..881b4a733 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectNotBePresent.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectNotBePresent.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltWaitForObjectNotBePresent : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectWhichContains.cs b/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectWhichContains.cs
index 345174313..ba142a5be 100644
--- a/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectWhichContains.cs
+++ b/Assets/AltTester/AltDriver/Commands/FindObjects/AltWaitForObjectWhichContains.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltWaitForObjectWhichContains : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs b/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs
index d82959265..69f58a6e4 100644
--- a/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs
+++ b/Assets/AltTester/AltDriver/Commands/IDriverCommunication.cs
@@ -1,7 +1,7 @@
 using System;
-using Altom.AltDriver.Notifications;
+using AltTester.AltDriver.Notifications;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public interface IDriverCommunication
     {
diff --git a/Assets/AltTester/AltDriver/Commands/IWebSocketClient.cs b/Assets/AltTester/AltDriver/Commands/IWebSocketClient.cs
index 6f2861320..85d3ff351 100644
--- a/Assets/AltTester/AltDriver/Commands/IWebSocketClient.cs
+++ b/Assets/AltTester/AltDriver/Commands/IWebSocketClient.cs
@@ -1,7 +1,7 @@
 using System;
 using AltWebSocketSharp;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public interface IWebSocketClient
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltBeginTouch.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltBeginTouch.cs
index 422087df6..09765ef11 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltBeginTouch.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltBeginTouch.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltBeginTouch : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltClickCoordinates.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltClickCoordinates.cs
index 1743415ac..b8108bf69 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltClickCoordinates.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltClickCoordinates.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltClickCoordinates : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltEndTouch.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltEndTouch.cs
index 497e82388..3302587c7 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltEndTouch.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltEndTouch.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltEndTouch : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysDown.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysDown.cs
index 009b6675a..208ac5282 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysDown.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysDown.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltKeysDown : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysUp.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysUp.cs
index 5d4d5098a..fd64654a0 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysUp.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltKeysUp.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltKeysUp : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveMouse.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveMouse.cs
index cc50487d3..9a4bd1f5b 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveMouse.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveMouse.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltMoveMouse : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveTouch.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveTouch.cs
index 4735016fb..1fb11c090 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveTouch.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltMoveTouch.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltMoveTouch : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltMultipointSwipe.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltMultipointSwipe.cs
index 7437f085e..c97e322be 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltMultipointSwipe.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltMultipointSwipe.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltMultipointSwipe : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltPressKeys.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltPressKeys.cs
index 60382f6e7..1d35085a5 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltPressKeys.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltPressKeys.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltPressKeys : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltScroll.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltScroll.cs
index a06f62488..8d8ec4c64 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltScroll.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltScroll.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltScroll : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltSwipe.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltSwipe.cs
index 0cee06fd4..f0d9f49de 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltSwipe.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltSwipe.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltSwipe : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltTapCoordinates.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltTapCoordinates.cs
index 75fd818d6..8d72e8f4f 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltTapCoordinates.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltTapCoordinates.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltTapCoordinates : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/InputActions/AltTilt.cs b/Assets/AltTester/AltDriver/Commands/InputActions/AltTilt.cs
index 38a9214ea..1f7789203 100644
--- a/Assets/AltTester/AltDriver/Commands/InputActions/AltTilt.cs
+++ b/Assets/AltTester/AltDriver/Commands/InputActions/AltTilt.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltTilt : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallComponentMethod.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallComponentMethod.cs
index 9f0e63591..87f757d6b 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallComponentMethod.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallComponentMethod.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltCallComponentMethod<T> : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallStaticMethod.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallStaticMethod.cs
index 0a63c89f6..9dbdfd3da 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallStaticMethod.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltCallStaticMethod.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltCallStaticMethod<T> : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltClickElement.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltClickElement.cs
index add2c16c8..7e8cb86bf 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltClickElement.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltClickElement.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltClickElement : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltDragObject.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltDragObject.cs
index ba82c48a2..121c09db2 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltDragObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltDragObject.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltDragObject : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllComponents.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllComponents.cs
index c7f7b4adf..c820e1f31 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllComponents.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllComponents.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllComponents : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllFields.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllFields.cs
index 4a1379061..cab0f3967 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllFields.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllFields.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllFields : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllMethods.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllMethods.cs
index 193bdfab0..946054e69 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllMethods.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllMethods.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllMethods : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllProperties.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllProperties.cs
index 1ddb713b9..57df9c358 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllProperties.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetAllProperties.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllProperties : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetComponentProperty.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetComponentProperty.cs
index a2b06d6ef..fd8a0e5dd 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetComponentProperty.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetComponentProperty.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetComponentProperty<T> : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetText.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetText.cs
index cdd0fb450..75c2228bf 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetText.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltGetText.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetText : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs
index 2712c9fdf..eac90306a 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltObjectAction.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     [Obsolete]
     public struct AltObjectAction
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerDownFromObject.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerDownFromObject.cs
index 2b5ca5d9c..6be906e6a 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerDownFromObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerDownFromObject.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltPointerDownFromObject : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerEnterObject.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerEnterObject.cs
index 18e5914d3..d5805520e 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerEnterObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerEnterObject.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltPointerEnterObject : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerExitObject.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerExitObject.cs
index 21b2d29e8..e6446a126 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerExitObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerExitObject.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltPointerExitObject : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerUpFromObject.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerUpFromObject.cs
index 659f1aa99..f4e755747 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerUpFromObject.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltPointerUpFromObject.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltPointerUpFromObject : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetComponentProperty.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetComponentProperty.cs
index 37d53b0d9..be901e782 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetComponentProperty.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetComponentProperty.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltSetComponentProperty : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetText.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetText.cs
index b220663ec..df8fdc47c 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetText.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltSetText.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltSetText : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltTapElement.cs b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltTapElement.cs
index 5c1d5c1b2..2a2cda9c0 100644
--- a/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltTapElement.cs
+++ b/Assets/AltTester/AltDriver/Commands/ObjectCommands/AltTapElement.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltTapElement : AltCommandReturningAltElement
     {
diff --git a/Assets/AltTester/AltDriver/Commands/Parameters/CommandParams.cs b/Assets/AltTester/AltDriver/Commands/Parameters/CommandParams.cs
index 662eb83cd..96514e329 100644
--- a/Assets/AltTester/AltDriver/Commands/Parameters/CommandParams.cs
+++ b/Assets/AltTester/AltDriver/Commands/Parameters/CommandParams.cs
@@ -1,13 +1,16 @@
 using System;
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.Notifications;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Notifications;
 using Newtonsoft.Json;
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class CommandParams
     {
         public string messageId;
+        public string driverId;
         public string commandName;
+        public bool isNotification;
+
         public CommandParams()
         {
             CommandAttribute cmdAttribute =
@@ -46,6 +49,7 @@ public class CommandError
     public class CommandResponse
     {
         public string messageId;
+        public string driverId;
         public string commandName;
         public CommandError error;
         public String data;
@@ -701,6 +705,7 @@ public AltEndTouchParams(int fingerId)
             this.fingerId = fingerId;
         }
     }
+
     [Command("activateNotification")]
     public class ActivateNotification : CommandParams
     {
@@ -711,6 +716,7 @@ public ActivateNotification(NotificationType notificationType)
             NotificationType = notificationType;
         }
     }
+
     [Command("deactivateNotification")]
     public class DeactivateNotification : CommandParams
     {
diff --git a/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetPNGScreenshot.cs b/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetPNGScreenshot.cs
index bf1f26f01..9bc4140ec 100644
--- a/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetPNGScreenshot.cs
+++ b/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetPNGScreenshot.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetPNGScreenshot : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs b/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs
index 90cdccc03..8e53c8c08 100644
--- a/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs
+++ b/Assets/AltTester/AltDriver/Commands/Screenshot/AltGetScreenshot.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetScreenshotResponse
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeleteKeyPlayerPref.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeleteKeyPlayerPref.cs
index 1c85b76de..20d96380b 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeleteKeyPlayerPref.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeleteKeyPlayerPref.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltDeleteKeyPlayerPref : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeletePlayerPref.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeletePlayerPref.cs
index 2bd7bdd21..000314586 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeletePlayerPref.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltDeletePlayerPref.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltDeletePlayerPref : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllActiveCameras.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllActiveCameras.cs
index 97c452b3e..a499cab89 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllActiveCameras.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllActiveCameras.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllActiveCameras : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllCameras.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllCameras.cs
index 142cb70af..01bd31365 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllCameras.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllCameras.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllCameras : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllLoadedScenes.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllLoadedScenes.cs
index e562011f1..d04f1ac17 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllLoadedScenes.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllLoadedScenes.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     internal class AltGetAllLoadedScenes : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllScenes.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllScenes.cs
index 4a4c8bb0a..657fa30f9 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllScenes.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetAllScenes.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetAllScenes : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetCurrentScene.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetCurrentScene.cs
index bb357f556..4710007dd 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetCurrentScene.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetCurrentScene.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetCurrentScene : AltBaseFindObjects
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetFloatKeyPlayerPref.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetFloatKeyPlayerPref.cs
index 1c81893f6..04a669fef 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetFloatKeyPlayerPref.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetFloatKeyPlayerPref.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetFloatKeyPlayerPref : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetIntKeyPlayerPref.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetIntKeyPlayerPref.cs
index 20bcdd2da..adf3b1c74 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetIntKeyPlayerPref.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetIntKeyPlayerPref.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetIntKeyPlayerPref : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetStringKeyPlayerPref.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetStringKeyPlayerPref.cs
index 92bef9272..456ab43ea 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetStringKeyPlayerPref.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetStringKeyPlayerPref.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetStringKeyPlayerPref : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetTimeScale.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetTimeScale.cs
index ddf89275a..cd35b238a 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetTimeScale.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltGetTimeScale.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltGetTimeScale : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltLoadScene.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltLoadScene.cs
index 77b98b524..579198d03 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltLoadScene.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltLoadScene.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltLoadScene : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetKeyPLayerPref.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetKeyPLayerPref.cs
index 9042a4aef..0ebcb07d3 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetKeyPLayerPref.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetKeyPLayerPref.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltSetKeyPLayerPref : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetTimeScale.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetTimeScale.cs
index 5ca3af96d..ad260efb0 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetTimeScale.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltSetTimeScale.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltSetTimeScale : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltUnloadScene.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltUnloadScene.cs
index 517528e6a..43c022f6a 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltUnloadScene.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltUnloadScene.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltUnloadScene : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltWaitForCurrentSceneToBe.cs b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltWaitForCurrentSceneToBe.cs
index aa92d6fce..032ec93a9 100644
--- a/Assets/AltTester/AltDriver/Commands/UnityCommands/AltWaitForCurrentSceneToBe.cs
+++ b/Assets/AltTester/AltDriver/Commands/UnityCommands/AltWaitForCurrentSceneToBe.cs
@@ -1,7 +1,7 @@
 using System.Threading;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Commands
+namespace AltTester.AltDriver.Commands
 {
     public class AltWaitForCurrentSceneToBe : AltBaseCommand
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltAxis.cs b/Assets/AltTester/AltDriver/Common/AltAxis.cs
index bb71ca585..bd1390dfe 100644
--- a/Assets/AltTester/AltDriver/Common/AltAxis.cs
+++ b/Assets/AltTester/AltDriver/Common/AltAxis.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltDriver
+﻿namespace AltTester.AltDriver
 {
     [System.Serializable]
     public class AltAxis
diff --git a/Assets/AltTester/AltDriver/Common/AltComponent.cs b/Assets/AltTester/AltDriver/Common/AltComponent.cs
index fd91c0a1d..59d14d6f6 100644
--- a/Assets/AltTester/AltDriver/Common/AltComponent.cs
+++ b/Assets/AltTester/AltDriver/Common/AltComponent.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltDriver
+﻿namespace AltTester.AltDriver
 {
     public struct AltComponent
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltFieldsSelections.cs b/Assets/AltTester/AltDriver/Common/AltFieldsSelections.cs
index 81fd3caaa..76a7f90ef 100644
--- a/Assets/AltTester/AltDriver/Common/AltFieldsSelections.cs
+++ b/Assets/AltTester/AltDriver/Common/AltFieldsSelections.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltDriver
+﻿namespace AltTester.AltDriver
 {
     public enum AltFieldsSelections
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltMethodSelection.cs b/Assets/AltTester/AltDriver/Common/AltMethodSelection.cs
index 74edf353c..9c85c7978 100644
--- a/Assets/AltTester/AltDriver/Common/AltMethodSelection.cs
+++ b/Assets/AltTester/AltDriver/Common/AltMethodSelection.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public enum AltMethodSelection
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltObject.cs b/Assets/AltTester/AltDriver/Common/AltObject.cs
index b7af88192..1aeeb977b 100644
--- a/Assets/AltTester/AltDriver/Common/AltObject.cs
+++ b/Assets/AltTester/AltDriver/Common/AltObject.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public class AltObject
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltObjectLight.cs b/Assets/AltTester/AltDriver/Common/AltObjectLight.cs
index ee98de39f..0d2cafede 100644
--- a/Assets/AltTester/AltDriver/Common/AltObjectLight.cs
+++ b/Assets/AltTester/AltDriver/Common/AltObjectLight.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public class AltObjectLight
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltObjectProperty.cs b/Assets/AltTester/AltDriver/Common/AltObjectProperty.cs
index 3f7466008..92cb4baa9 100644
--- a/Assets/AltTester/AltDriver/Common/AltObjectProperty.cs
+++ b/Assets/AltTester/AltDriver/Common/AltObjectProperty.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltDriver
+﻿namespace AltTester.AltDriver
 {
     public struct AltObjectProperty
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltPropertiesSelections.cs b/Assets/AltTester/AltDriver/Common/AltPropertiesSelections.cs
index 300e5c608..793ad2efc 100644
--- a/Assets/AltTester/AltDriver/Common/AltPropertiesSelections.cs
+++ b/Assets/AltTester/AltDriver/Common/AltPropertiesSelections.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public enum AltPropertiesSelections
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltProperty.cs b/Assets/AltTester/AltDriver/Common/AltProperty.cs
index ef986d399..6ffb480d8 100644
--- a/Assets/AltTester/AltDriver/Common/AltProperty.cs
+++ b/Assets/AltTester/AltDriver/Common/AltProperty.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public struct AltProperty
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltTextureInformation.cs b/Assets/AltTester/AltDriver/Common/AltTextureInformation.cs
index b6c091df7..b76bd89fe 100644
--- a/Assets/AltTester/AltDriver/Common/AltTextureInformation.cs
+++ b/Assets/AltTester/AltDriver/Common/AltTextureInformation.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public struct AltTextureInformation
     {
diff --git a/Assets/AltTester/AltDriver/Common/AltType.cs b/Assets/AltTester/AltDriver/Common/AltType.cs
index 2d4cd3015..2e07c0b00 100644
--- a/Assets/AltTester/AltDriver/Common/AltType.cs
+++ b/Assets/AltTester/AltDriver/Common/AltType.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltDriver
+﻿namespace AltTester.AltDriver
 {
     public enum AltType
     {
diff --git a/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs b/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs
index 8fc1f4f6f..ae25fd9fd 100644
--- a/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs
+++ b/Assets/AltTester/AltDriver/Logging/AltLogLevel.cs
@@ -1,5 +1,5 @@
 
-namespace Altom.AltDriver.Logging
+namespace AltTester.AltDriver.Logging
 {
     public enum AltLogLevel
     {
diff --git a/Assets/AltTester/AltDriver/Logging/AltLogLevelExtensions.cs b/Assets/AltTester/AltDriver/Logging/AltLogLevelExtensions.cs
index 781e52517..8aed61175 100644
--- a/Assets/AltTester/AltDriver/Logging/AltLogLevelExtensions.cs
+++ b/Assets/AltTester/AltDriver/Logging/AltLogLevelExtensions.cs
@@ -1,6 +1,6 @@
 using NLog;
 
-namespace Altom.AltDriver.Logging
+namespace AltTester.AltDriver.Logging
 {
     public static class AltLogLevelExtensions
     {
diff --git a/Assets/AltTester/AltDriver/Logging/AltLogger.cs b/Assets/AltTester/AltDriver/Logging/AltLogger.cs
index bfc815e18..5f55b6525 100644
--- a/Assets/AltTester/AltDriver/Logging/AltLogger.cs
+++ b/Assets/AltTester/AltDriver/Logging/AltLogger.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Logging
+namespace AltTester.AltDriver.Logging
 {
     public enum AltLogger
     {
diff --git a/Assets/AltTester/AltDriver/Logging/DriverLogManager.cs b/Assets/AltTester/AltDriver/Logging/DriverLogManager.cs
index 0180bbf84..52cd017b2 100644
--- a/Assets/AltTester/AltDriver/Logging/DriverLogManager.cs
+++ b/Assets/AltTester/AltDriver/Logging/DriverLogManager.cs
@@ -5,7 +5,7 @@
 using NLog.Layouts;
 using NLog.Targets;
 
-namespace Altom.AltDriver.Logging
+namespace AltTester.AltDriver.Logging
 {
     public class DriverLogManager
     {
diff --git a/Assets/AltTester/AltDriver/Logging/UnityTarget.cs b/Assets/AltTester/AltDriver/Logging/UnityTarget.cs
index 279bcae0c..d7c16ca7e 100644
--- a/Assets/AltTester/AltDriver/Logging/UnityTarget.cs
+++ b/Assets/AltTester/AltDriver/Logging/UnityTarget.cs
@@ -3,7 +3,7 @@
 using NLog.Targets;
 using UnityEngine;
 
-namespace Altom.AltDriver.Logging
+namespace AltTester.AltDriver.Logging
 {
     /// <summary> An appender which logs to the unity console. </summary>
     public class UnityTarget : TargetWithLayout
diff --git a/Assets/AltTester/AltDriver/Notifications/AltLoadSceneMode.cs b/Assets/AltTester/AltDriver/Notifications/AltLoadSceneMode.cs
index 6db72800f..f9487709e 100644
--- a/Assets/AltTester/AltDriver/Notifications/AltLoadSceneMode.cs
+++ b/Assets/AltTester/AltDriver/Notifications/AltLoadSceneMode.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver.Notifications
+namespace AltTester.AltDriver.Notifications
 {
     public enum AltLoadSceneMode
     {
diff --git a/Assets/AltTester/AltDriver/Notifications/AltLoadSceneNotificationResultParams.cs b/Assets/AltTester/AltDriver/Notifications/AltLoadSceneNotificationResultParams.cs
index 6c83bc20b..f3ddc3a01 100644
--- a/Assets/AltTester/AltDriver/Notifications/AltLoadSceneNotificationResultParams.cs
+++ b/Assets/AltTester/AltDriver/Notifications/AltLoadSceneNotificationResultParams.cs
@@ -1,5 +1,5 @@
 
-namespace Altom.AltDriver.Notifications
+namespace AltTester.AltDriver.Notifications
 {
     public class AltLoadSceneNotificationResultParams
     {
diff --git a/Assets/AltTester/AltDriver/Notifications/AltLogNotificationResultParams.cs b/Assets/AltTester/AltDriver/Notifications/AltLogNotificationResultParams.cs
index d7cdaa9c6..a9081455e 100644
--- a/Assets/AltTester/AltDriver/Notifications/AltLogNotificationResultParams.cs
+++ b/Assets/AltTester/AltDriver/Notifications/AltLogNotificationResultParams.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Notifications
+namespace AltTester.AltDriver.Notifications
 {
     public class AltLogNotificationResultParams
     {
diff --git a/Assets/AltTester/AltDriver/Notifications/BaseNotificationCallBacks.cs b/Assets/AltTester/AltDriver/Notifications/BaseNotificationCallBacks.cs
index d6121d169..5918c28b2 100644
--- a/Assets/AltTester/AltDriver/Notifications/BaseNotificationCallBacks.cs
+++ b/Assets/AltTester/AltDriver/Notifications/BaseNotificationCallBacks.cs
@@ -1,7 +1,7 @@
 using System;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 
-namespace Altom.AltDriver.Notifications
+namespace AltTester.AltDriver.Notifications
 {
     public class BaseNotificationCallBacks : INotificationCallbacks
     {
diff --git a/Assets/AltTester/AltDriver/Notifications/INotificationCallbacks.cs b/Assets/AltTester/AltDriver/Notifications/INotificationCallbacks.cs
index da372c2c4..8a7d1129f 100644
--- a/Assets/AltTester/AltDriver/Notifications/INotificationCallbacks.cs
+++ b/Assets/AltTester/AltDriver/Notifications/INotificationCallbacks.cs
@@ -1,5 +1,5 @@
 
-namespace Altom.AltDriver.Notifications
+namespace AltTester.AltDriver.Notifications
 {
     public interface INotificationCallbacks
     {
diff --git a/Assets/AltTester/AltDriver/Notifications/NotificationType.cs b/Assets/AltTester/AltDriver/Notifications/NotificationType.cs
index 010240bfb..efffb60f4 100644
--- a/Assets/AltTester/AltDriver/Notifications/NotificationType.cs
+++ b/Assets/AltTester/AltDriver/Notifications/NotificationType.cs
@@ -1,5 +1,5 @@
 using System;
-namespace Altom.AltDriver.Notifications
+namespace AltTester.AltDriver.Notifications
 {
     public enum NotificationType
     {
diff --git a/Assets/AltTester/AltDriver/UnityStruct/AltColor.cs b/Assets/AltTester/AltDriver/UnityStruct/AltColor.cs
index 3f3e345cc..7d8e49b2a 100644
--- a/Assets/AltTester/AltDriver/UnityStruct/AltColor.cs
+++ b/Assets/AltTester/AltDriver/UnityStruct/AltColor.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public struct AltColor
     {
diff --git a/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs b/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs
index bf2f57857..23c95d3ce 100644
--- a/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs
+++ b/Assets/AltTester/AltDriver/UnityStruct/AltKeyCode.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public enum AltKeyCode
     {
diff --git a/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs b/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs
index 14b21963d..618bc71d8 100644
--- a/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs
+++ b/Assets/AltTester/AltDriver/UnityStruct/AltVector.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public struct AltVector2
     {
diff --git a/Assets/AltTester/AltDriver/UnityStruct/PLayerPrefKeyType.cs b/Assets/AltTester/AltDriver/UnityStruct/PLayerPrefKeyType.cs
index f25f550d3..4ecec905f 100644
--- a/Assets/AltTester/AltDriver/UnityStruct/PLayerPrefKeyType.cs
+++ b/Assets/AltTester/AltDriver/UnityStruct/PLayerPrefKeyType.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltDriver
+namespace AltTester.AltDriver
 {
     public enum PlayerPrefKeyType { Int = 1, String, Float }
 
diff --git a/Assets/AltTester/AltServer/AltId.cs b/Assets/AltTester/AltServer/AltId.cs
index a7e576cc9..817704a4d 100644
--- a/Assets/AltTester/AltServer/AltId.cs
+++ b/Assets/AltTester/AltServer/AltId.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     [DisallowMultipleComponent]
     public class AltId : MonoBehaviour
diff --git a/Assets/AltTester/AltServer/AltInstrumentationSettings.cs b/Assets/AltTester/AltServer/AltInstrumentationSettings.cs
index 8cc9fd860..373fd902a 100644
--- a/Assets/AltTester/AltServer/AltInstrumentationSettings.cs
+++ b/Assets/AltTester/AltServer/AltInstrumentationSettings.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public enum AltInstrumentationMode
     {
@@ -26,16 +26,14 @@ public class AltInstrumentationSettings
         /// </summary>
         public int ProxyPort = 13000;
 
-        /// <summary>
-        /// The port AltTester is listening on for connections from driver.
-        /// </summary>
-        public int AltTesterPort = 13000;
+        public string GameName = "__default__";
 
 
         /// <summary>
         /// If true, it will show where an action happens on screen ( e.g. swipe or click )
         /// </summary>
         public bool InputVisualizer = true;
+
         /// <summary>
         /// If true, it will display the `AltTester` popup in Instrumented Unity App
         /// </summary>
diff --git a/Assets/AltTester/AltServer/AltKeyMapping.cs b/Assets/AltTester/AltServer/AltKeyMapping.cs
index a6b1ea5e8..832d8a6db 100644
--- a/Assets/AltTester/AltServer/AltKeyMapping.cs
+++ b/Assets/AltTester/AltServer/AltKeyMapping.cs
@@ -4,7 +4,7 @@
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public class AltKeyMapping
     {
diff --git a/Assets/AltTester/AltServer/AltMockUpPointerInputModule.cs b/Assets/AltTester/AltServer/AltMockUpPointerInputModule.cs
index 657e4a555..9bfd88818 100644
--- a/Assets/AltTester/AltServer/AltMockUpPointerInputModule.cs
+++ b/Assets/AltTester/AltServer/AltMockUpPointerInputModule.cs
@@ -5,7 +5,7 @@
 using UnityEngine.InputSystem.UI;
 using static UnityEngine.EventSystems.ExecuteEvents;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public class AltMockUpPointerInputModule : StandaloneInputModule
     {
diff --git a/Assets/AltTester/AltServer/AltPrefabDrag.cs b/Assets/AltTester/AltServer/AltPrefabDrag.cs
index 6ceb310b6..4fa38c7e9 100644
--- a/Assets/AltTester/AltServer/AltPrefabDrag.cs
+++ b/Assets/AltTester/AltServer/AltPrefabDrag.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace Altom.AltTester.UI
+namespace AltTester.UI
 {
 
     public class AltPrefabDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
@@ -26,7 +26,7 @@ public void OnDrag(PointerEventData eventData)
 #if ENABLE_LEGACY_INPUT_MANAGER
                 eventData.pointerDrag.transform.position = Input.mousePosition;
 #else
-            eventData.pointerDrag.gameObject.transform.position = UnityEngine.InputSystem.Mouse.current.position.ReadValue();
+                eventData.pointerDrag.gameObject.transform.position = UnityEngine.InputSystem.Mouse.current.position.ReadValue();
 #endif
                 var objectTranform = (RectTransform)eventData.pointerDrag.transform;
                 if (objectTranform.position.x < objectTranform.rect.width )
diff --git a/Assets/AltTester/AltServer/AltRunner.cs b/Assets/AltTester/AltServer/AltRunner.cs
index 5d68f964b..4cfe72087 100644
--- a/Assets/AltTester/AltServer/AltRunner.cs
+++ b/Assets/AltTester/AltServer/AltRunner.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
-using Altom.AltTester.Communication;
-using Altom.AltTester.Logging;
-using Altom.AltTester.Notification;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
+using AltTester.Communication;
+using AltTester.Logging;
+using AltTester.Notification;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public class AltRunner : UnityEngine.MonoBehaviour
     {
@@ -35,9 +35,9 @@ public class AltRunner : UnityEngine.MonoBehaviour
         protected void Awake()
         {
 #if !ALTTESTER
-            logger.Error("ALTTESTER needs to be added to 'Scripting Define Symbols'");
-            Destroy(this.gameObject);
-            return;
+                        logger.Error("ALTTESTER needs to be added to 'Scripting Define Symbols'");
+                        Destroy(this.gameObject);
+                        return;
 
 #else
             if (_altRunner != null)
diff --git a/Assets/AltTester/AltServer/AltTextureScale.cs b/Assets/AltTester/AltServer/AltTextureScale.cs
index 0c9a0467c..cfaa209d5 100644
--- a/Assets/AltTester/AltServer/AltTextureScale.cs
+++ b/Assets/AltTester/AltServer/AltTextureScale.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltTester
+namespace AltTester
 {
     public class AltTextureScale
     {
diff --git a/Assets/AltTester/AltServer/Commands/AltCommand.cs b/Assets/AltTester/AltServer/Commands/AltCommand.cs
index 86a3a71f2..74c050ad8 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommand.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Globalization;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 using Newtonsoft.Json;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public abstract class AltCommand<TParam, TResult> where TParam : CommandParams
     {
@@ -138,6 +138,7 @@ protected CommandResponse ExecuteHandleErrors<T>(Func<T> action)
             var cmdResponse = new CommandResponse();
             cmdResponse.commandName = CommandParams.commandName;
             cmdResponse.messageId = CommandParams.messageId;
+            cmdResponse.driverId = CommandParams.driverId;
 
             if (response != null)
             {
diff --git a/Assets/AltTester/AltServer/Commands/AltCommandWithWait.cs b/Assets/AltTester/AltServer/Commands/AltCommandWithWait.cs
index 539066b5f..34d451071 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommandWithWait.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommandWithWait.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public abstract class AltCommandWithWait<TParam, TResult> : AltCommand<TParam, TResult> where TParam : CommandParams
     {
diff --git a/Assets/AltTester/AltServer/Commands/AltCommands/AltActivateNotificationCommand.cs b/Assets/AltTester/AltServer/Commands/AltCommands/AltActivateNotificationCommand.cs
index 7cd07df35..9daca93a1 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommands/AltActivateNotificationCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommands/AltActivateNotificationCommand.cs
@@ -1,19 +1,20 @@
 using System;
-using Altom.AltDriver.Commands;
-using Altom.AltDriver.Notifications;
-using Altom.AltTester.Communication;
-using Altom.AltTester.Notification;
+using AltTester.AltDriver.Commands;
+using AltTester.AltDriver.Notifications;
+using AltTester.Communication;
+using AltTester.Notification;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltActivateNotificationCommand : AltCommand<ActivateNotification, string>
     {
         ICommandHandler commandHandler;
+
         public AltActivateNotificationCommand(ICommandHandler commandHandler, ActivateNotification cmdParams) : base(cmdParams)
         {
             this.commandHandler = commandHandler;
-
         }
+
         public override string Execute()
         {
             switch (CommandParams.NotificationType)
@@ -33,6 +34,5 @@ public override string Execute()
             }
             return "Ok";
         }
-
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/AltTester/AltServer/Commands/AltCommands/AltDeactivateNotificationCommand.cs b/Assets/AltTester/AltServer/Commands/AltCommands/AltDeactivateNotificationCommand.cs
index d7aee0b92..6277ada4b 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommands/AltDeactivateNotificationCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommands/AltDeactivateNotificationCommand.cs
@@ -1,10 +1,10 @@
 using System;
-using Altom.AltDriver.Commands;
-using Altom.AltDriver.Notifications;
-using Altom.AltTester.Communication;
-using Altom.AltTester.Notification;
+using AltTester.AltDriver.Commands;
+using AltTester.AltDriver.Notifications;
+using AltTester.Communication;
+using AltTester.Notification;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltDeactivateNotificationCommand : AltCommand<DeactivateNotification, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/AltCommands/AltGetServerVersionCommand.cs b/Assets/AltTester/AltServer/Commands/AltCommands/AltGetServerVersionCommand.cs
index 69afd2386..40539699d 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommands/AltGetServerVersionCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommands/AltGetServerVersionCommand.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltGetServerVersionCommand : AltCommand<AltGetServerVersionParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/AltCommands/AltInvalidCommand.cs b/Assets/AltTester/AltServer/Commands/AltCommands/AltInvalidCommand.cs
index f89b12025..20ad685c6 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommands/AltInvalidCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommands/AltInvalidCommand.cs
@@ -1,18 +1,18 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltInvalidCommand : AltCommand<CommandParams, string>
     {
         private readonly Exception ex;
 
-
         public AltInvalidCommand(CommandParams cmdParams, Exception ex) : base(cmdParams ?? new CommandParams(AltErrors.errorInvalidCommand, null))
         {
             this.ex = ex;
         }
+
         public override string Execute()
         {
             throw new InvalidCommandException(ex);
diff --git a/Assets/AltTester/AltServer/Commands/AltCommands/AltSetServerLoggingCommand.cs b/Assets/AltTester/AltServer/Commands/AltCommands/AltSetServerLoggingCommand.cs
index bd1f34374..abddc196f 100644
--- a/Assets/AltTester/AltServer/Commands/AltCommands/AltSetServerLoggingCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltCommands/AltSetServerLoggingCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver.Commands;
+using AltTester.Logging;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltSetServerLoggingCommand : AltCommand<AltSetServerLoggingParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/AltUnityCommands/AltResetInputCommand.cs b/Assets/AltTester/AltServer/Commands/AltUnityCommands/AltResetInputCommand.cs
index cd946f7f0..21d88ff70 100644
--- a/Assets/AltTester/AltServer/Commands/AltUnityCommands/AltResetInputCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/AltUnityCommands/AltResetInputCommand.cs
@@ -1,5 +1,6 @@
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Logging;
+using AltTester;
+using AltTester.AltDriver.Commands;
+using AltTester.Commands;
 
 namespace Altom.AltTester.Commands
 {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltBaseClassFindObjectsCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltBaseClassFindObjectsCommand.cs
index f04f41784..9f649ee83 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltBaseClassFindObjectsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltBaseClassFindObjectsCommand.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltBaseClassFindObjectsCommand<T> : AltCommand<BaseFindObjectsParams, T>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectAtCoordinatesCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectAtCoordinatesCommand.cs
index 5efa932e4..523b010d4 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectAtCoordinatesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectAtCoordinatesCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltFindObjectAtCoordinatesCommand : AltCommand<AltFindObjectAtCoordinatesParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectCommand.cs
index d766db805..9d891b334 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectCommand.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltFindObjectCommand : AltBaseClassFindObjectsCommand<AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsCommand.cs
index 0fe7604ff..6c7f478c2 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsCommand.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltFindObjectsCommand : AltBaseClassFindObjectsCommand<List<AltObject>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsLightCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsLightCommand.cs
index 9d75be915..d9672cdaf 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsLightCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltFindObjectsLightCommand.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltFindObjectsLightCommand : AltBaseClassFindObjectsCommand<List<AltObjectLight>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllCamerasCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllCamerasCommand.cs
index c42b94c49..60c6810db 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllCamerasCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllCamerasCommand.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllCamerasCommand : AltCommand<CommandParams, List<AltObject>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllLoadedScenesAndObjectsCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllLoadedScenesAndObjectsCommand.cs
index 531751b8f..81df7c78d 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllLoadedScenesAndObjectsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllLoadedScenesAndObjectsCommand.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllLoadedScenesAndObjectsCommand : AltBaseClassFindObjectsCommand<List<AltObjectLight>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllScenesCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllScenesCommand.cs
index a79f0787e..01ce615a5 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllScenesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltGetAllScenesCommand.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltGetAllScenesCommand : AltCommand<AltGetAllScenesParams, List<string>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/AltGetCurrentSceneCommand.cs b/Assets/AltTester/AltServer/Commands/FindObject/AltGetCurrentSceneCommand.cs
index 2002ed5ab..599f5ec69 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/AltGetCurrentSceneCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/AltGetCurrentSceneCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltGetCurrentSceneCommand : AltCommand<AltGetCurrentSceneParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/FindObject/PathSelector.cs b/Assets/AltTester/AltServer/Commands/FindObject/PathSelector.cs
index 5beafb0c9..ed29145f0 100644
--- a/Assets/AltTester/AltServer/Commands/FindObject/PathSelector.cs
+++ b/Assets/AltTester/AltServer/Commands/FindObject/PathSelector.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Altom.AltDriver;
+using AltTester.AltDriver;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public enum BoundType
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltBeginTouchCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltBeginTouchCommand.cs
index 8914dffb2..25c38e0d3 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltBeginTouchCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltBeginTouchCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltBeginTouchCommand : AltCommand<AltBeginTouchParams, int>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltClickCoordinatesCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltClickCoordinatesCommand.cs
index c635720db..2b641c94b 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltClickCoordinatesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltClickCoordinatesCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltClickCoordinatesCommand : AltCommandWithWait<AltClickCoordinatesParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltClickElementCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltClickElementCommand.cs
index 80abc7c8a..34bf89db2 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltClickElementCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltClickElementCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltClickElementCommand : AltCommandWithWait<AltClickElementParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltDragObjectCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltDragObjectCommand.cs
index 03cb74e1c..2f537acee 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltDragObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltDragObjectCommand.cs
@@ -1,9 +1,9 @@
-﻿using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+﻿using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
 
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltDragObjectCommand : AltCommand<AltDragObjectParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltEndTouchCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltEndTouchCommand.cs
index 4d2f7ccd3..01f8d176f 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltEndTouchCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltEndTouchCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltEndTouchCommand : AltCommandWithWait<AltEndTouchParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltKeysDownCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltKeysDownCommand.cs
index 4f0eae813..c039f7c76 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltKeysDownCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltKeysDownCommand.cs
@@ -1,8 +1,8 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltKeysDownCommand : AltCommand<AltKeysDownParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltKeysUpCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltKeysUpCommand.cs
index 6bef2b301..40e564f32 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltKeysUpCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltKeysUpCommand.cs
@@ -1,8 +1,8 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltKeysUpCommand : AltCommand<AltKeysUpParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltMoveMouseCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltMoveMouseCommand.cs
index 4f706999e..2574e2850 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltMoveMouseCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltMoveMouseCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltMoveMouseCommand : AltCommandWithWait<AltMoveMouseParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltMoveTouchCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltMoveTouchCommand.cs
index e8f8bccce..58f37d067 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltMoveTouchCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltMoveTouchCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltMoveTouchCommand : AltCommand<AltMoveTouchParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltMultipointSwipeCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltMultipointSwipeCommand.cs
index dfea46c96..67d4490aa 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltMultipointSwipeCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltMultipointSwipeCommand.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltMultipointSwipeCommand : AltCommandWithWait<AltMultipointSwipeParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerDownFromObjectCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerDownFromObjectCommand.cs
index 9b026c07d..3ffb3ecc6 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerDownFromObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerDownFromObjectCommand.cs
@@ -1,7 +1,7 @@
-﻿using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+﻿using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltPointerDownFromObjectCommand : AltCommand<AltPointerDownFromObjectParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerEnterObjectCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerEnterObjectCommand.cs
index f3e34a546..4a6e01cfb 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerEnterObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerEnterObjectCommand.cs
@@ -1,7 +1,7 @@
-﻿using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+﻿using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltPointerEnterObjectCommand : AltCommand<AltPointerEnterObjectParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerExitObjectCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerExitObjectCommand.cs
index 65f4a2a12..05d7290f1 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerExitObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerExitObjectCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltPointerExitObjectCommand : AltCommand<AltPointerExitObjectParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerUpFromObjectCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerUpFromObjectCommand.cs
index c860b49ca..716bc7602 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltPointerUpFromObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltPointerUpFromObjectCommand.cs
@@ -1,7 +1,7 @@
-﻿using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+﻿using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltPointerUpFromObjectCommand : AltCommand<AltPointerUpFromObjectParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltPressKeyboardKeysCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltPressKeyboardKeysCommand.cs
index 83e65e860..e3fd4628d 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltPressKeyboardKeysCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltPressKeyboardKeysCommand.cs
@@ -1,10 +1,10 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltPressKeyboardKeysCommand : AltCommandWithWait<AltPressKeyboardKeysParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltScrollCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltScrollCommand.cs
index eb32cc7ed..5c733989f 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltScrollCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltScrollCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltScrollCommand : AltCommandWithWait<AltScrollParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltSwipeCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltSwipeCommand.cs
index 001ee2a61..c889b9d42 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltSwipeCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltSwipeCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltSwipeCommand : AltCommandWithWait<AltSwipeParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltTapCoordinatesCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltTapCoordinatesCommand.cs
index 25f14db1e..a0dedabfe 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltTapCoordinatesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltTapCoordinatesCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltTapCoordinatesCommand : AltCommandWithWait<AltTapCoordinatesParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltTapElementCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltTapElementCommand.cs
index 90e407764..15c3f895c 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltTapElementCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltTapElementCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltTapElementCommand : AltCommandWithWait<AltTapElementParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/InputActions/AltTiltCommand.cs b/Assets/AltTester/AltServer/Commands/InputActions/AltTiltCommand.cs
index 369d12700..af1aee072 100644
--- a/Assets/AltTester/AltServer/Commands/InputActions/AltTiltCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/InputActions/AltTiltCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltTiltCommand : AltCommandWithWait<AltTiltParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltCallComponentMethodForObjectCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltCallComponentMethodForObjectCommand.cs
index 51fcedf87..03bcb4e4e 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltCallComponentMethodForObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltCallComponentMethodForObjectCommand.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltCallComponentMethodForObjectCommand : AltReflectionMethodsCommand<AltCallComponentMethodForObjectParams, object>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltContractResolver.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltContractResolver.cs
index 4245295e9..f2474514e 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltContractResolver.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltContractResolver.cs
@@ -4,7 +4,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltContractResolver : DefaultContractResolver
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllComponentsCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllComponentsCommand.cs
index 7db9fc6f8..ddbdfa985 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllComponentsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllComponentsCommand.cs
@@ -1,9 +1,9 @@
 ﻿using System.Collections.Generic;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Logging;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllComponentsCommand : AltCommand<AltGetAllComponentsParams, List<AltComponent>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllFieldsCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllFieldsCommand.cs
index b6cf6858b..e8fc2b7ca 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllFieldsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllFieldsCommand.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Logging;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllFieldsCommand : AltReflectionMethodsCommand<AltGetAllFieldsParams, List<AltProperty>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllMethodsCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllMethodsCommand.cs
index 8d803d2e4..634095c7e 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllMethodsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllMethodsCommand.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllMethodsCommand : AltReflectionMethodsCommand<AltGetAllMethodsParams, List<string>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllPropertiesCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllPropertiesCommand.cs
index d261fd8d3..5a143c1d2 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllPropertiesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetAllPropertiesCommand.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Logging;
 using Newtonsoft.Json;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllPropertiesCommand : AltReflectionMethodsCommand<AltGetAllPropertiesParams, List<AltProperty>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetComponentPropertyCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetComponentPropertyCommand.cs
index 6aceae6ae..fa2cc9560 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetComponentPropertyCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetComponentPropertyCommand.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetComponentPropertyCommand : AltReflectionMethodsCommand<AltGetObjectComponentPropertyParams, object>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetTextCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetTextCommand.cs
index 736530bbb..f86cfeb2d 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetTextCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltGetTextCommand.cs
@@ -1,8 +1,8 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetTextCommand : AltReflectionMethodsCommand<AltGetTextParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltReflectionMethodsCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltReflectionMethodsCommand.cs
index 38024c234..67ca03855 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltReflectionMethodsCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltReflectionMethodsCommand.cs
@@ -5,12 +5,12 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Logging;
 using Newtonsoft.Json;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltReflectionMethodsCommand<TParam, TResult> : AltCommand<TParam, TResult> where TParam : CommandParams
     {
@@ -327,7 +327,7 @@ private object getInstance(object instance, string[] methodPathSplited, int inde
                 {
                     path += methodPathSplited[i] + ".";
                 }
-                throw new Altom.AltDriver.NullReferenceException(path + propertyName + "is not assigned");
+                throw new AltTester.AltDriver.NullReferenceException(path + propertyName + "is not assigned");
             }
             index++;
             return getInstance(instance, methodPathSplited, index);
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetComponentPropertyCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetComponentPropertyCommand.cs
index 8e0fee73a..69fc4b75e 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetComponentPropertyCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetComponentPropertyCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltSetComponentPropertyCommand : AltReflectionMethodsCommand<AltSetObjectComponentPropertyParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetTextCommand.cs b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetTextCommand.cs
index 03b5780e9..37da3070f 100644
--- a/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetTextCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/ObjectCommands/AltSetTextCommand.cs
@@ -1,10 +1,10 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltSetTextCommand : AltReflectionMethodsCommand<AltSetTextParams, AltObject>
     {
diff --git a/Assets/AltTester/AltServer/Commands/Screenshot/AltBaseScreenshotCommand.cs b/Assets/AltTester/AltServer/Commands/Screenshot/AltBaseScreenshotCommand.cs
index e3cd4cf73..4a638abe9 100644
--- a/Assets/AltTester/AltServer/Commands/Screenshot/AltBaseScreenshotCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/Screenshot/AltBaseScreenshotCommand.cs
@@ -2,13 +2,13 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
+using AltTester.Logging;
 using Newtonsoft.Json;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public abstract class AltBaseScreenshotCommand<TParams, TResult> : AltCommand<TParams, TResult> where TParams : CommandParams
     {
diff --git a/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotCommand.cs b/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotCommand.cs
index f95c034a6..d9a53ecb8 100644
--- a/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotCommand.cs
@@ -1,8 +1,8 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltGetScreenshotCommand : AltBaseScreenshotCommand<AltGetScreenshotParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotPNGCommand.cs b/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotPNGCommand.cs
index c1afbb63c..5d5b77c43 100644
--- a/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotPNGCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/Screenshot/AltGetScreenshotPNGCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetScreenshotPNGCommand : AltBaseScreenshotCommand<AltGetPNGScreenshotParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/Screenshot/AltHighlightSelectedObjectCommand.cs b/Assets/AltTester/AltServer/Commands/Screenshot/AltHighlightSelectedObjectCommand.cs
index d46c6eeca..37043be27 100644
--- a/Assets/AltTester/AltServer/Commands/Screenshot/AltHighlightSelectedObjectCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/Screenshot/AltHighlightSelectedObjectCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltHighlightSelectedObjectCommand : AltBaseScreenshotCommand<AltHighlightObjectScreenshotParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/Screenshot/AltHightlightObjectFromCoordinatesCommand.cs b/Assets/AltTester/AltServer/Commands/Screenshot/AltHightlightObjectFromCoordinatesCommand.cs
index 22e096628..dce7ef641 100644
--- a/Assets/AltTester/AltServer/Commands/Screenshot/AltHightlightObjectFromCoordinatesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/Screenshot/AltHightlightObjectFromCoordinatesCommand.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 using UnityEngine;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltHighlightObjectFromCoordinatesCommand : AltBaseScreenshotCommand<AltHighlightObjectFromCoordinatesScreenshotParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeleteKeyPlayerPrefCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeleteKeyPlayerPrefCommand.cs
index 609c6e7b4..2038e00f0 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeleteKeyPlayerPrefCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeleteKeyPlayerPrefCommand.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltDeleteKeyPlayerPrefCommand : AltCommand<AltDeleteKeyPlayerPrefParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeletePlayerPrefCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeletePlayerPrefCommand.cs
index 5ee1fb37c..ac2f43298 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeletePlayerPrefCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltDeletePlayerPrefCommand.cs
@@ -1,6 +1,6 @@
-﻿using Altom.AltDriver.Commands;
+﻿using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltDeletePlayerPrefCommand : AltCommand<AltDeletePlayerPrefParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetAllLoadedScenesCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetAllLoadedScenesCommand.cs
index 6b75695d6..638eb8159 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetAllLoadedScenesCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetAllLoadedScenesCommand.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetAllLoadedScenesCommand : AltCommand<AltGetAllLoadedScenesParams, List<string>>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetKeyPlayerPrefCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetKeyPlayerPrefCommand.cs
index 8c25dc3a1..6e6d9cd00 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetKeyPlayerPrefCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetKeyPlayerPrefCommand.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetStringKeyPlayerPrefCommand : AltCommand<AltGetKeyPlayerPrefParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetTimeScaleCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetTimeScaleCommand.cs
index 49058304c..baa71a009 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetTimeScaleCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltGetTimeScaleCommand.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltGetTimeScaleCommand : AltCommand<AltGetTimeScaleParams, float>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltLoadSceneCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltLoadSceneCommand.cs
index 8a9f44666..5fd7fec85 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltLoadSceneCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltLoadSceneCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     public class AltLoadSceneCommand : AltCommand<AltLoadSceneParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetKeyPlayerPrefCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetKeyPlayerPrefCommand.cs
index c62d3a904..9f184c808 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetKeyPlayerPrefCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetKeyPlayerPrefCommand.cs
@@ -1,8 +1,8 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltSetKeyPlayerPrefCommand : AltCommand<AltSetKeyPlayerPrefParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetTimeScaleCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetTimeScaleCommand.cs
index f53ec17ec..3e0b1a29b 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetTimeScaleCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltSetTimeScaleCommand.cs
@@ -1,6 +1,6 @@
-﻿using Altom.AltDriver.Commands;
+﻿using AltTester.AltDriver.Commands;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltSetTimeScaleCommand : AltCommand<AltSetTimeScaleParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityCommands/AltUnloadSceneCommand.cs b/Assets/AltTester/AltServer/Commands/UnityCommands/AltUnloadSceneCommand.cs
index 33f71c3f6..b5db998a0 100644
--- a/Assets/AltTester/AltServer/Commands/UnityCommands/AltUnloadSceneCommand.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityCommands/AltUnloadSceneCommand.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Commands
+namespace AltTester.Commands
 {
     class AltUnloadSceneCommand : AltCommand<AltUnloadSceneParams, string>
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityNotification/AltLoadSceneNotification.cs b/Assets/AltTester/AltServer/Commands/UnityNotification/AltLoadSceneNotification.cs
index 145372d77..6e1a96a49 100644
--- a/Assets/AltTester/AltServer/Commands/UnityNotification/AltLoadSceneNotification.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityNotification/AltLoadSceneNotification.cs
@@ -1,8 +1,8 @@
-using Altom.AltDriver.Notifications;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver.Notifications;
+using AltTester.Communication;
 using UnityEngine.SceneManagement;
 
-namespace Altom.AltTester.Notification
+namespace AltTester.Notification
 {
     public class AltLoadSceneNotification : BaseNotification
     {
@@ -14,7 +14,6 @@ public AltLoadSceneNotification(ICommandHandler commandHandler, bool isOn) : bas
             {
                 SceneManager.sceneLoaded += onSceneLoaded;
             }
-
         }
 
         static void onSceneLoaded(Scene scene, LoadSceneMode mode)
diff --git a/Assets/AltTester/AltServer/Commands/UnityNotification/AltLogNotification.cs b/Assets/AltTester/AltServer/Commands/UnityNotification/AltLogNotification.cs
index 27787879f..65e6cacf1 100644
--- a/Assets/AltTester/AltServer/Commands/UnityNotification/AltLogNotification.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityNotification/AltLogNotification.cs
@@ -1,10 +1,10 @@
 using System.Reflection;
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.Notifications;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Notifications;
+using AltTester.Communication;
 using UnityEngine;
 
-namespace Altom.AltTester.Notification
+namespace AltTester.Notification
 {
     public class AltLogNotification : BaseNotification
     {
@@ -16,7 +16,6 @@ public AltLogNotification(ICommandHandler commandHandler, bool isOn) : base(comm
             {
                 Application.logMessageReceived += onLogReceived;
             }
-
         }
 
         static void onLogReceived(string message, string stackTrace, LogType type)
diff --git a/Assets/AltTester/AltServer/Commands/UnityNotification/AltTesterApplicationPausedNotification.cs b/Assets/AltTester/AltServer/Commands/UnityNotification/AltTesterApplicationPausedNotification.cs
index 42c6a40c3..53d5132e1 100644
--- a/Assets/AltTester/AltServer/Commands/UnityNotification/AltTesterApplicationPausedNotification.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityNotification/AltTesterApplicationPausedNotification.cs
@@ -1,6 +1,6 @@
-using Altom.AltTester.Communication;
+using AltTester.Communication;
 
-namespace Altom.AltTester.Notification
+namespace AltTester.Notification
 {
     public class AltTesterApplicationPausedNotification : BaseNotification
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityNotification/AltUnloadSceneNotification.cs b/Assets/AltTester/AltServer/Commands/UnityNotification/AltUnloadSceneNotification.cs
index 6934e393b..e2bc1da48 100644
--- a/Assets/AltTester/AltServer/Commands/UnityNotification/AltUnloadSceneNotification.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityNotification/AltUnloadSceneNotification.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
-using Altom.AltDriver.Notifications;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver.Notifications;
+using AltTester.Communication;
 using UnityEngine.SceneManagement;
 
-namespace Altom.AltTester.Notification
+namespace AltTester.Notification
 {
     public class AltUnloadSceneNotification : BaseNotification
     {
diff --git a/Assets/AltTester/AltServer/Commands/UnityNotification/BaseNotification.cs b/Assets/AltTester/AltServer/Commands/UnityNotification/BaseNotification.cs
index ca3621fd3..1a5a17502 100644
--- a/Assets/AltTester/AltServer/Commands/UnityNotification/BaseNotification.cs
+++ b/Assets/AltTester/AltServer/Commands/UnityNotification/BaseNotification.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
-using Altom.AltDriver.Commands;
-using Altom.AltTester.Communication;
+using AltTester.AltDriver.Commands;
+using AltTester.Communication;
 using Newtonsoft.Json;
 
-namespace Altom.AltTester.Notification
+namespace AltTester.Notification
 {
     public class BaseNotification
     {
diff --git a/Assets/AltTester/AltServer/Communication/AltClientWebSocketHandler.cs b/Assets/AltTester/AltServer/Communication/AltClientWebSocketHandler.cs
index 634a1ba09..0db54dd24 100644
--- a/Assets/AltTester/AltServer/Communication/AltClientWebSocketHandler.cs
+++ b/Assets/AltTester/AltServer/Communication/AltClientWebSocketHandler.cs
@@ -1,19 +1,17 @@
 using AltWebSocketSharp;
 using UnityEngine.Playables;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
     public class AltClientWebSocketHandler : BaseWebSocketHandler
     {
         private readonly WebSocket _webSocket;
 
-
         public AltClientWebSocketHandler(WebSocket webSocket, ICommandHandler commandHandler) : base(commandHandler)
         {
             this._webSocket = webSocket;
             webSocket.OnMessage += this.onMessage;
 
-
             this._commandHandler.OnSendMessage += webSocket.Send;
         }
 
diff --git a/Assets/AltTester/AltServer/Communication/AltResponseQueue.cs b/Assets/AltTester/AltServer/Communication/AltResponseQueue.cs
index 96bfeaef3..417e7b93a 100644
--- a/Assets/AltTester/AltServer/Communication/AltResponseQueue.cs
+++ b/Assets/AltTester/AltServer/Communication/AltResponseQueue.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
     public delegate void SendResponse();
 
@@ -11,7 +11,10 @@ public class AltResponseQueue
 
         public void Cycle()
         {
-            if (responseQueue.Count == 0) return;
+            if (responseQueue.Count == 0) {
+                return;
+            }
+
             lock (queueLock)
             {
                 if (responseQueue.Count > 0)
@@ -31,7 +34,12 @@ public void ScheduleResponse(SendResponse newResponse)
                 }
             }
         }
+
+        public void Clear() {
+            lock (queueLock)
+            {
+                responseQueue.Clear();
+            }
+        }
     }
 }
-
-
diff --git a/Assets/AltTester/AltServer/Communication/AltServerWebSocketHandler.cs b/Assets/AltTester/AltServer/Communication/AltServerWebSocketHandler.cs
deleted file mode 100644
index 4f05bc93d..000000000
--- a/Assets/AltTester/AltServer/Communication/AltServerWebSocketHandler.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Altom.AltTester.Logging;
-using AltWebSocketSharp;
-using AltWebSocketSharp.Server;
-
-namespace Altom.AltTester.Communication
-{
-    public class AltServerWebSocketHandler : WebSocketBehavior
-    {
-        private static readonly NLog.Logger logger = ServerLogManager.Instance.GetCurrentClassLogger();
-        private ICommandHandler commandHandler;
-
-        public CommunicationErrorHandler OnErrorHandler;
-        public CommunicationHandler OnClientConnected;
-        public CommunicationHandler OnClientDisconnected;
-
-        public AltServerWebSocketHandler()
-        {
-
-        }
-
-        public void Init(ICommandHandler cmdHandler)
-        {
-            this.commandHandler = cmdHandler;
-            commandHandler.OnSendMessage += this.Send;
-        }
-
-        protected override void OnOpen()
-        {
-            base.OnOpen();
-
-            logger.Debug("Client " + this.ID + " connected.");
-            if (OnClientConnected != null) OnClientConnected.Invoke();
-        }
-
-        protected override void OnClose(CloseEventArgs e)
-        {
-            base.OnClose(e);
-            logger.Debug("Client " + this.ID + " disconnected.");
-            if (OnClientDisconnected != null) OnClientDisconnected.Invoke();
-            commandHandler.OnSendMessage -= this.Send;
-        }
-
-        protected override void OnError(ErrorEventArgs e)
-        {
-            base.OnError(e);
-            if (OnErrorHandler != null)
-                OnErrorHandler.Invoke(e.Message, e.Exception);
-        }
-
-        protected override void OnMessage(MessageEventArgs e)
-        {
-            base.OnMessage(e);
-            commandHandler.OnMessage(e.Data);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/AltTester/AltServer/Communication/AltServerWebSocketHandler.cs.meta b/Assets/AltTester/AltServer/Communication/AltServerWebSocketHandler.cs.meta
deleted file mode 100644
index 52f0158c4..000000000
--- a/Assets/AltTester/AltServer/Communication/AltServerWebSocketHandler.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b802b628166b4a04bad6457633b869fd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/AltTester/AltServer/Communication/AltWebGLWebSocketHandler.cs b/Assets/AltTester/AltServer/Communication/AltWebGLWebSocketHandler.cs
index 46aa89e15..24effffdd 100644
--- a/Assets/AltTester/AltServer/Communication/AltWebGLWebSocketHandler.cs
+++ b/Assets/AltTester/AltServer/Communication/AltWebGLWebSocketHandler.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
 #if UNITY_WEBGL
     public class AltWebGLWebSocketHandler : BaseWebSocketHandler
@@ -13,13 +13,11 @@ public AltWebGLWebSocketHandler(ICommandHandler cmdHandler, WebGLWebSocket webSo
             this._webSocket.OnMessage += this.onMessage;
 
             _commandHandler.OnSendMessage += (message) =>
-             {
-                 this._webSocket.SendText(message).ConfigureAwait(false).GetAwaiter().GetResult();
-             };
-
-
-
+            {
+                this._webSocket.SendText(message).ConfigureAwait(false).GetAwaiter().GetResult();
+            };
         }
+
         private void onMessage(byte[] data)
         {
             var message = Encoding.UTF8.GetString(data);
@@ -27,4 +25,4 @@ private void onMessage(byte[] data)
         }
     }
 #endif
-}
\ No newline at end of file
+}
diff --git a/Assets/AltTester/AltServer/Communication/BaseWebSocketHandler.cs b/Assets/AltTester/AltServer/Communication/BaseWebSocketHandler.cs
index 0b6101179..b0032bbea 100644
--- a/Assets/AltTester/AltServer/Communication/BaseWebSocketHandler.cs
+++ b/Assets/AltTester/AltServer/Communication/BaseWebSocketHandler.cs
@@ -1,13 +1,12 @@
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
     public class BaseWebSocketHandler
     {
         protected readonly ICommandHandler _commandHandler;
 
-
         public BaseWebSocketHandler(ICommandHandler commandHandler)
         {
             _commandHandler = commandHandler;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/AltTester/AltServer/Communication/CommandHandler.cs b/Assets/AltTester/AltServer/Communication/CommandHandler.cs
index 87e10e6dd..1df525a32 100644
--- a/Assets/AltTester/AltServer/Communication/CommandHandler.cs
+++ b/Assets/AltTester/AltServer/Communication/CommandHandler.cs
@@ -2,17 +2,19 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using Altom.AltDriver;
-using Altom.AltDriver.Commands;
 using Altom.AltTester.Commands;
-using Altom.AltTester.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Commands;
+using AltTester.Commands;
+using AltTester.Logging;
 using Newtonsoft.Json;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
     public class CommandHandler : ICommandHandler
     {
         private static readonly NLog.Logger logger = ServerLogManager.Instance.GetCurrentClassLogger();
+        private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings { Culture = CultureInfo.InvariantCulture };
 
         public CommandHandler()
         {
@@ -20,29 +22,33 @@ public CommandHandler()
 
         public SendMessageHandler OnSendMessage { get; set; }
 
+        public NotificationHandler OnDriverConnect { get; set; }
+        public NotificationHandler OnDriverDisconnect { get; set; }
+
         public void Send(string data)
         {
             if (this.OnSendMessage != null)
             {
                 this.OnSendMessage.Invoke(data);
-                logger.Debug("response sent: " + trimLog(data));
+                logger.Debug(string.Format("response sent: {0}", trimLog(data)));
             }
         }
 
         public void OnMessage(string data)
         {
-            logger.Debug("command received: " + trimLog(data));
+            logger.Debug(string.Format("command received: {0}", trimLog(data)));
 
-            var jsonSerializerSettings = new JsonSerializerSettings
-            {
-                Culture = CultureInfo.InvariantCulture
-            };
             Func<string> executeAndSerialize = null;
             CommandParams cmdParams = null;
 
             try
             {
                 cmdParams = JsonConvert.DeserializeObject<CommandParams>(data, jsonSerializerSettings);
+                if (cmdParams.isNotification) {
+                    handleNotifications(cmdParams);
+                    return;
+                }
+
                 var type = getCommandType((string)cmdParams.commandName);
                 var commandParams = JsonConvert.DeserializeObject(data, type, jsonSerializerSettings) as CommandParams;
                 executeAndSerialize = createCommand(commandParams);
@@ -58,22 +64,30 @@ public void OnMessage(string data)
 
             AltRunner._responseQueue.ScheduleResponse(delegate
                 {
-
                     var response = executeAndSerialize();
-                    //TODO: remove this
-                    if (!cmdParams.commandName.Equals("endTouch")) //Temporary solution to ignore first "Ok"
+
+                    // TODO: Remove this if statement
+                    if (!cmdParams.commandName.Equals("endTouch")) // Temporary solution to ignore first "Ok"
                     {
-                        //Do not remove the send only the if
+                        // Do not remove the send only the if statement
                         this.Send(response);
                     }
                 });
         }
 
-        private string trimLog(string log, int maxLogLength = 1000)
-        {
-            if (string.IsNullOrEmpty(log)) return log;
-            if (log.Length <= maxLogLength) return log;
-            return log.Substring(0, maxLogLength) + "[...]";
+        public void handleNotifications(CommandParams cmdParams) {
+            if (cmdParams.commandName == "DriverConnectedNotification") {
+                if (this.OnDriverConnect != null)
+                {
+                    this.OnDriverConnect.Invoke(cmdParams.driverId);
+                }
+            }
+            else if (cmdParams.commandName == "DriverDisconnectedNotification") {
+                if (this.OnDriverDisconnect != null)
+                {
+                    this.OnDriverDisconnect.Invoke(cmdParams.driverId);
+                }
+            }
         }
 
         private Func<string> createCommand(CommandParams cmdParams)
@@ -326,16 +340,34 @@ private Type getCommandType(string commandName)
             var derivedType = typeof(CommandParams);
             var type = assembly.GetTypes().FirstOrDefault(t =>
                {
-                   if (derivedType.IsAssignableFrom(t)) // if type derrives from CommandParams
-                   {
-                       CommandAttribute cmdAttribute = (CommandAttribute)Attribute.GetCustomAttribute(t, typeof(CommandAttribute));
-                       return cmdAttribute != null && cmdAttribute.Name == commandName;
-                   }
-                   return false;
+                    if (derivedType.IsAssignableFrom(t)) // If type derrives from CommandParams
+                    {
+                        CommandAttribute cmdAttribute = (CommandAttribute)Attribute.GetCustomAttribute(t, typeof(CommandAttribute));
+                        return cmdAttribute != null && cmdAttribute.Name == commandName;
+                    }
+
+                    return false;
                });
 
-            if (type == null) { throw new CommandNotFoundException(string.Format("Command `{0}` not found", commandName)); }
+            if (type == null)
+            {
+                throw new CommandNotFoundException(string.Format("Command `{0}` not found", commandName));
+            }
+
             return type;
         }
+
+        private string trimLog(string log, int maxLogLength = 1000)
+        {
+            if (string.IsNullOrEmpty(log)) {
+                return log;
+            }
+
+            if (log.Length <= maxLogLength) {
+                return log;
+            }
+
+            return log.Substring(0, maxLogLength) + "[...]";
+        }
     }
 }
diff --git a/Assets/AltTester/AltServer/Communication/ICommandHandler.cs b/Assets/AltTester/AltServer/Communication/ICommandHandler.cs
index b78b2eac4..aebfdb4e3 100644
--- a/Assets/AltTester/AltServer/Communication/ICommandHandler.cs
+++ b/Assets/AltTester/AltServer/Communication/ICommandHandler.cs
@@ -1,9 +1,15 @@
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
+    public delegate void NotificationHandler(string driverId);
+
     public interface ICommandHandler
     {
         SendMessageHandler OnSendMessage { get; set; }
+
+        NotificationHandler OnDriverConnect { get; set; }
+        NotificationHandler OnDriverDisconnect { get; set; }
+
         void Send(string data);
         void OnMessage(string data);
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/AltTester/AltServer/Communication/ICommunication.cs b/Assets/AltTester/AltServer/Communication/ICommunication.cs
index aa1e7a268..e792f4d02 100644
--- a/Assets/AltTester/AltServer/Communication/ICommunication.cs
+++ b/Assets/AltTester/AltServer/Communication/ICommunication.cs
@@ -1,10 +1,11 @@
 using System;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
     public delegate void SendMessageHandler(string message);
     public delegate void CommunicationHandler();
     public delegate void CommunicationErrorHandler(string message, Exception error);
+
     public interface ICommunication
     {
         CommunicationHandler OnConnect { get; set; }
@@ -20,15 +21,13 @@ public class UnhandledStartCommError : Exception
     {
         public UnhandledStartCommError(string message, Exception innerException) : base(message, innerException)
         {
-
         }
     }
+
     public class AddressInUseCommError : Exception
     {
         public AddressInUseCommError(string message) : base(message)
         {
-
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/Assets/AltTester/AltServer/Communication/Plugins/WebSocket.jslib b/Assets/AltTester/AltServer/Communication/Plugins/WebSocket.jslib
index bcf694bb3..b149b0c33 100644
--- a/Assets/AltTester/AltServer/Communication/Plugins/WebSocket.jslib
+++ b/Assets/AltTester/AltServer/Communication/Plugins/WebSocket.jslib
@@ -1,384 +1,336 @@
-/**
- * TextEncoder polyfill for IE
- */
-if (typeof TextEncoder === "undefined") {
-  TextEncoder = function TextEncoder() { };
-  TextEncoder.prototype.encode = function encode(str) {
-    "use strict";
-    var Len = str.length, resPos = -1;
-    // The Uint8Array's length must be at least 3x the length of the string because an invalid UTF-16
-    //  takes up the equivelent space of 3 UTF-8 characters to encode it properly. However, Array's
-    //  have an auto expanding length and 1.5x should be just the right balance for most uses.
-    var resArr = typeof Uint8Array === "undefined" ? new Array(Len * 1.5) : new Uint8Array(Len * 3);
-    for (var point = 0, nextcode = 0, i = 0; i !== Len;) {
-      point = str.charCodeAt(i), i += 1;
-      if (point >= 0xD800 && point <= 0xDBFF) {
-        if (i === Len) {
-          resArr[resPos += 1] = 0xef/*0b11101111*/; resArr[resPos += 1] = 0xbf/*0b10111111*/;
-          resArr[resPos += 1] = 0xbd/*0b10111101*/; break;
-        }
-        // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
-        nextcode = str.charCodeAt(i);
-        if (nextcode >= 0xDC00 && nextcode <= 0xDFFF) {
-          point = (point - 0xD800) * 0x400 + nextcode - 0xDC00 + 0x10000;
-          i += 1;
-          if (point > 0xffff) {
-            resArr[resPos += 1] = (0x1e/*0b11110*/ << 3) | (point >>> 18);
-            resArr[resPos += 1] = (0x2/*0b10*/ << 6) | ((point >>> 12) & 0x3f/*0b00111111*/);
-            resArr[resPos += 1] = (0x2/*0b10*/ << 6) | ((point >>> 6) & 0x3f/*0b00111111*/);
-            resArr[resPos += 1] = (0x2/*0b10*/ << 6) | (point & 0x3f/*0b00111111*/);
-            continue;
-          }
-        } else {
-          resArr[resPos += 1] = 0xef/*0b11101111*/; resArr[resPos += 1] = 0xbf/*0b10111111*/;
-          resArr[resPos += 1] = 0xbd/*0b10111101*/; continue;
-        }
-      }
-      if (point <= 0x007f) {
-        resArr[resPos += 1] = (0x0/*0b0*/ << 7) | point;
-      } else if (point <= 0x07ff) {
-        resArr[resPos += 1] = (0x6/*0b110*/ << 5) | (point >>> 6);
-        resArr[resPos += 1] = (0x2/*0b10*/ << 6) | (point & 0x3f/*0b00111111*/);
-      } else {
-        resArr[resPos += 1] = (0xe/*0b1110*/ << 4) | (point >>> 12);
-        resArr[resPos += 1] = (0x2/*0b10*/ << 6) | ((point >>> 6) & 0x3f/*0b00111111*/);
-        resArr[resPos += 1] = (0x2/*0b10*/ << 6) | (point & 0x3f/*0b00111111*/);
-      }
-    }
-    if (typeof Uint8Array !== "undefined") return resArr.subarray(0, resPos + 1);
-    // else // IE 6-9
-    resArr.length = resPos + 1; // trim off extra weight
-    return resArr;
-  };
-  TextEncoder.prototype.toString = function () { return "[object TextEncoder]" };
-  try { // Object.defineProperty only works on DOM prototypes in IE8
-    Object.defineProperty(TextEncoder.prototype, "encoding", {
-      get: function () {
-        if (TextEncoder.prototype.isPrototypeOf(this)) return "utf-8";
-        else throw TypeError("Illegal invocation");
-      }
-    });
-  } catch (e) { /*IE6-8 fallback*/ TextEncoder.prototype.encoding = "utf-8"; }
-  if (typeof Symbol !== "undefined") TextEncoder.prototype[Symbol.toStringTag] = "TextEncoder";
-}
 
 var LibraryWebSocket = {
-  $textEncoder: new TextEncoder(),
-  $webSocketState: {
-    /*
-     * Map of instances
-     *
-     * Instance structure:
-     * {
-     * 	url: string,
-     * 	ws: WebSocket
-     * }
-     */
-    instances: {},
-
-    /* Last instance ID */
-    lastId: 0,
-
-    /* Event listeners */
-    onOpen: null,
-    onMesssage: null,
-    onError: null,
-    onClose: null,
-
-    /* Debug mode */
-    debug: false
-  },
-
-  /**
-   * Set onOpen callback
-   *
-   * @param callback Reference to C# static function
-   */
-  WebSocketSetOnOpen: function (callback) {
+	$webSocketState: {
+		/*
+		 * Map of instances
+		 *
+		 * Instance structure:
+		 * {
+		 * 	url: string,
+		 * 	ws: WebSocket
+		 * }
+		 */
+		instances: {},
+
+		/* Last instance ID */
+		lastId: 0,
+
+		/* Event listeners */
+		onOpen: null,
+		onMesssage: null,
+		onError: null,
+		onClose: null,
+
+		/* Debug mode */
+		debug: false
+	},
+
+	/**
+	 * Set onOpen callback
+	 *
+	 * @param callback Reference to C# static function
+	 */
+	WebSocketSetOnOpen: function (callback) {
+
+		webSocketState.onOpen = callback;
+
+	},
+
+	/**
+	 * Set onMessage callback
+	 *
+	 * @param callback Reference to C# static function
+	 */
+	WebSocketSetOnMessage: function (callback) {
 
-    webSocketState.onOpen = callback;
+		webSocketState.onMessage = callback;
 
-  },
+	},
 
-  /**
-   * Set onMessage callback
-   *
-   * @param callback Reference to C# static function
-   */
-  WebSocketSetOnMessage: function (callback) {
+	/**
+	 * Set onError callback
+	 *
+	 * @param callback Reference to C# static function
+	 */
+	WebSocketSetOnError: function (callback) {
 
-    webSocketState.onMessage = callback;
+		webSocketState.onError = callback;
 
-  },
+	},
 
-  /**
-   * Set onError callback
-   *
-   * @param callback Reference to C# static function
-   */
-  WebSocketSetOnError: function (callback) {
+	/**
+	 * Set onClose callback
+	 *
+	 * @param callback Reference to C# static function
+	 */
+	WebSocketSetOnClose: function (callback) {
 
-    webSocketState.onError = callback;
+		webSocketState.onClose = callback;
 
-  },
+	},
 
-  /**
-   * Set onClose callback
-   *
-   * @param callback Reference to C# static function
-   */
-  WebSocketSetOnClose: function (callback) {
+	/**
+	 * Allocate new WebSocket instance struct
+	 *
+	 * @param url Server URL
+	 */
+	WebSocketAllocate: function (url) {
 
-    webSocketState.onClose = callback;
+		var urlStr = UTF8ToString(url);
+		var id = webSocketState.lastId++;
 
-  },
+		webSocketState.instances[id] = {
+			subprotocols: [],
+			url: urlStr,
+			ws: null
+		};
 
-  /**
-   * Allocate new WebSocket instance struct
-   *
-   * @param url Server URL
-   */
-  WebSocketAllocate: function (url) {
+		return id;
 
-    var urlStr = Pointer_stringify(url);
-    var id = webSocketState.lastId++;
+	},
 
-    webSocketState.instances[id] = {
-      url: urlStr,
-      ws: null
-    };
+	/**
+	 * Add subprotocol to instance
+	 *
+	 * @param instanceId Instance ID
+	 * @param subprotocol Subprotocol name to add to instance
+	 */
+	WebSocketAddSubProtocol: function (instanceId, subprotocol) {
 
-    return id;
+		var subprotocolStr = UTF8ToString(subprotocol);
+		webSocketState.instances[instanceId].subprotocols.push(subprotocolStr);
 
-  },
+	},
 
-  /**
-   * Remove reference to WebSocket instance
-   *
-   * If socket is not closed function will close it but onClose event will not be emitted because
-   * this function should be invoked by C# WebSocket destructor.
-   *
-   * @param instanceId Instance ID
-   */
-  WebSocketFree: function (instanceId) {
+	/**
+	 * Remove reference to WebSocket instance
+	 *
+	 * If socket is not closed function will close it but onClose event will not be emitted because
+	 * this function should be invoked by C# WebSocket destructor.
+	 *
+	 * @param instanceId Instance ID
+	 */
+	WebSocketFree: function (instanceId) {
 
-    var instance = webSocketState.instances[instanceId];
+		var instance = webSocketState.instances[instanceId];
 
-    if (!instance) return 0;
+		if (!instance) return 0;
 
-    // Close if not closed
-    if (instance.ws !== null && instance.ws.readyState < 2)
-      instance.ws.close();
+		// Close if not closed
+		if (instance.ws && instance.ws.readyState < 2)
+			instance.ws.close();
 
-    // Remove reference
-    delete webSocketState.instances[instanceId];
+		// Remove reference
+		delete webSocketState.instances[instanceId];
 
-    return 0;
+		return 0;
 
-  },
+	},
 
-  /**
-   * Connect WebSocket to the server
-   *
-   * @param instanceId Instance ID
-   */
-  WebSocketConnect: function (instanceId) {
+	/**
+	 * Connect WebSocket to the server
+	 *
+	 * @param instanceId Instance ID
+	 */
+	WebSocketConnect: function (instanceId) {
 
-    var instance = webSocketState.instances[instanceId];
-    if (!instance) return -1;
+		var instance = webSocketState.instances[instanceId];
+		if (!instance) return -1;
 
-    if (instance.ws !== null)
-      return -2;
+		if (instance.ws !== null)
+			return -2;
 
-    instance.ws = new WebSocket(instance.url);
+		instance.ws = new WebSocket(instance.url, instance.subprotocols);
 
-    instance.ws.binaryType = 'arraybuffer';
+		instance.ws.binaryType = 'arraybuffer';
 
-    instance.ws.onopen = function () {
+		instance.ws.onopen = function () {
 
-      if (webSocketState.debug)
-        console.log("[JSLIB WebSocket] Connected.");
+			if (webSocketState.debug)
+				console.log("[JSLIB WebSocket] Connected.");
 
-      if (webSocketState.onOpen)
-        Runtime.dynCall('vi', webSocketState.onOpen, [instanceId]);
+			if (webSocketState.onOpen)
+				Module.dynCall_vi(webSocketState.onOpen, instanceId);
 
-    };
+		};
 
-    instance.ws.onmessage = function (ev) {
+		instance.ws.onmessage = function (ev) {
 
-      if (webSocketState.debug)
-        console.log("[JSLIB WebSocket] Received message:", ev.data);
+			if (webSocketState.debug)
+				console.log("[JSLIB WebSocket] Received message:", ev.data);
 
-      if (webSocketState.onMessage === null)
-        return;
+			if (webSocketState.onMessage === null)
+				return;
 
-      if (ev.data instanceof ArrayBuffer) {
+			if (ev.data instanceof ArrayBuffer) {
 
-        var dataBuffer = new Uint8Array(ev.data);
+				var dataBuffer = new Uint8Array(ev.data);
 
-        var buffer = _malloc(dataBuffer.length);
-        HEAPU8.set(dataBuffer, buffer);
+				var buffer = _malloc(dataBuffer.length);
+				HEAPU8.set(dataBuffer, buffer);
 
-        try {
-          Runtime.dynCall('viii', webSocketState.onMessage, [instanceId, buffer, dataBuffer.length]);
-        } finally {
-          _free(buffer);
-        }
+				try {
+					Module.dynCall_viii(webSocketState.onMessage, instanceId, buffer, dataBuffer.length);
+				} finally {
+					_free(buffer);
+				}
 
-      } else {
-        var dataBuffer = textEncoder.encode(ev.data);
+			} else {
+				var dataBuffer = (new TextEncoder()).encode(ev.data);
 
-        var buffer = _malloc(dataBuffer.length);
-        HEAPU8.set(dataBuffer, buffer);
+				var buffer = _malloc(dataBuffer.length);
+				HEAPU8.set(dataBuffer, buffer);
 
-        try {
-          Runtime.dynCall('viii', webSocketState.onMessage, [instanceId, buffer, dataBuffer.length]);
-        } finally {
-          _free(buffer);
-        }
+				try {
+					Module.dynCall_viii(webSocketState.onMessage, instanceId, buffer, dataBuffer.length);
+				} finally {
+					_free(buffer);
+				}
 
-      }
+			}
 
-    };
+		};
 
-    instance.ws.onerror = function (ev) {
+		instance.ws.onerror = function (ev) {
 
-      if (webSocketState.debug)
-        console.log("[JSLIB WebSocket] Error occured.");
+			if (webSocketState.debug)
+				console.log("[JSLIB WebSocket] Error occured.");
 
-      if (webSocketState.onError) {
+			if (webSocketState.onError) {
 
-        var msg = "WebSocket error.";
-        var msgBytes = lengthBytesUTF8(msg);
-        var msgBuffer = _malloc(msgBytes + 1);
-        stringToUTF8(msg, msgBuffer, msgBytes);
+				var msg = "WebSocket error.";
+				var length = lengthBytesUTF8(msg) + 1;
+				var buffer = _malloc(length);
+				stringToUTF8(msg, buffer, length);
 
-        try {
-          Runtime.dynCall('vii', webSocketState.onError, [instanceId, msgBuffer]);
-        } finally {
-          _free(msgBuffer);
-        }
+				try {
+					Module.dynCall_vii(webSocketState.onError, instanceId, msgBuffer);
+				} finally {
+					_free(msgBuffer);
+				}
 
-      }
+			}
 
-    };
+		};
 
-    instance.ws.onclose = function (ev) {
+		instance.ws.onclose = function (ev) {
 
-      if (webSocketState.debug)
-        console.log("[JSLIB WebSocket] Closed.");
+			if (webSocketState.debug)
+				console.log("[JSLIB WebSocket] Closed.");
 
-      if (webSocketState.onClose)
-        Runtime.dynCall('vii', webSocketState.onClose, [instanceId, ev.code]);
+			if (webSocketState.onClose)
+				Module.dynCall_vii(webSocketState.onClose, instanceId, ev.code);
 
-      delete instance.ws;
+			delete instance.ws;
 
-    };
+		};
 
-    return 0;
+		return 0;
 
-  },
+	},
 
-  /**
-   * Close WebSocket connection
-   *
-   * @param instanceId Instance ID
-   * @param code Close status code
-   * @param reasonPtr Pointer to reason string
-   */
-  WebSocketClose: function (instanceId, code, reasonPtr) {
+	/**
+	 * Close WebSocket connection
+	 *
+	 * @param instanceId Instance ID
+	 * @param code Close status code
+	 * @param reasonPtr Pointer to reason string
+	 */
+	WebSocketClose: function (instanceId, code, reasonPtr) {
 
-    var instance = webSocketState.instances[instanceId];
-    if (!instance) return -1;
+		var instance = webSocketState.instances[instanceId];
+		if (!instance) return -1;
 
-    if (instance.ws === null)
-      return -3;
+		if (!instance.ws)
+			return -3;
 
-    if (instance.ws.readyState === 2)
-      return -4;
+		if (instance.ws.readyState === 2)
+			return -4;
 
-    if (instance.ws.readyState === 3)
-      return -5;
+		if (instance.ws.readyState === 3)
+			return -5;
 
-    var reason = (reasonPtr ? Pointer_stringify(reasonPtr) : undefined);
+		var reason = (reasonPtr ? UTF8ToString(reasonPtr) : undefined);
 
-    try {
-      instance.ws.close(code, reason);
-    } catch (err) {
-      return -7;
-    }
+		try {
+			instance.ws.close(code, reason);
+		} catch (err) {
+			return -7;
+		}
 
-    return 0;
+		return 0;
 
-  },
+	},
 
-  /**
-   * Send message over WebSocket
-   *
-   * @param instanceId Instance ID
-   * @param bufferPtr Pointer to the message buffer
-   * @param length Length of the message in the buffer
-   */
-  WebSocketSend: function (instanceId, bufferPtr, length) {
+	/**
+	 * Send message over WebSocket
+	 *
+	 * @param instanceId Instance ID
+	 * @param bufferPtr Pointer to the message buffer
+	 * @param length Length of the message in the buffer
+	 */
+	WebSocketSend: function (instanceId, bufferPtr, length) {
 
-    var instance = webSocketState.instances[instanceId];
-    if (!instance) return -1;
+		var instance = webSocketState.instances[instanceId];
+		if (!instance) return -1;
 
-    if (instance.ws === null)
-      return -3;
+		if (!instance.ws)
+			return -3;
 
-    if (instance.ws.readyState !== 1)
-      return -6;
+		if (instance.ws.readyState !== 1)
+			return -6;
 
-    instance.ws.send(HEAPU8.buffer.slice(bufferPtr, bufferPtr + length));
+		instance.ws.send(HEAPU8.buffer.slice(bufferPtr, bufferPtr + length));
 
-    return 0;
+		return 0;
 
-  },
+	},
 
-  /**
-   * Send text message over WebSocket
-   *
-   * @param instanceId Instance ID
-   * @param bufferPtr Pointer to the message buffer
-   * @param length Length of the message in the buffer
-   */
-  WebSocketSendText: function (instanceId, message) {
+	/**
+	 * Send text message over WebSocket
+	 *
+	 * @param instanceId Instance ID
+	 * @param bufferPtr Pointer to the message buffer
+	 * @param length Length of the message in the buffer
+	 */
+	WebSocketSendText: function (instanceId, message) {
 
-    var instance = webSocketState.instances[instanceId];
-    if (!instance) return -1;
+		var instance = webSocketState.instances[instanceId];
+		if (!instance) return -1;
 
-    if (instance.ws === null)
-      return -3;
+		if (!instance.ws)
+			return -3;
 
-    if (instance.ws.readyState !== 1)
-      return -6;
+		if (instance.ws.readyState !== 1)
+			return -6;
 
-    instance.ws.send(Pointer_stringify(message));
+		instance.ws.send(UTF8ToString(message));
 
-    return 0;
+		return 0;
 
-  },
+	},
 
-  /**
-   * Return WebSocket readyState
-   *
-   * @param instanceId Instance ID
-   */
-  WebSocketGetState: function (instanceId) {
+	/**
+	 * Return WebSocket readyState
+	 *
+	 * @param instanceId Instance ID
+	 */
+	WebSocketGetState: function (instanceId) {
 
-    var instance = webSocketState.instances[instanceId];
-    if (!instance) return -1;
+		var instance = webSocketState.instances[instanceId];
+		if (!instance) return -1;
 
-    if (instance.ws)
-      return instance.ws.readyState;
-    else
-      return 3;
+		if (instance.ws)
+			return instance.ws.readyState;
+		else
+			return 3;
 
-  }
+	}
 
 };
 
 autoAddDeps(LibraryWebSocket, '$webSocketState');
-autoAddDeps(LibraryWebSocket, '$textEncoder');
-mergeInto(LibraryManager.library, LibraryWebSocket);
\ No newline at end of file
+mergeInto(LibraryManager.library, LibraryWebSocket);
+
+// https://github.com/WalletConnect/WalletConnectUnity/pull/36 - solved runtime/module error
+// https://github.com/emscripten-core/emscripten/pull/8011 - solved UTF8 encoding error
\ No newline at end of file
diff --git a/Assets/AltTester/AltServer/Communication/WebSocketClientCommunication.cs b/Assets/AltTester/AltServer/Communication/WebSocketClientCommunication.cs
index 48b79639a..70e906ed8 100644
--- a/Assets/AltTester/AltServer/Communication/WebSocketClientCommunication.cs
+++ b/Assets/AltTester/AltServer/Communication/WebSocketClientCommunication.cs
@@ -1,23 +1,29 @@
 using System;
-using Altom.AltTester.Logging;
+using AltTester.Logging;
 using AltWebSocketSharp;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
     public class WebSocketClientCommunication : ICommunication
     {
         private static readonly NLog.Logger logger = ServerLogManager.Instance.GetCurrentClassLogger();
         private readonly AltClientWebSocketHandler websocketHandler;
+
         WebSocket wsClient;
+
         private readonly int port;
         private readonly string host;
+        private readonly string gameName;
 
-        public WebSocketClientCommunication(ICommandHandler cmdHandler, string host, int port)
+        public WebSocketClientCommunication(ICommandHandler cmdHandler, string host, int port, string gameName)
         {
             this.port = port;
             this.host = host;
+            this.gameName = gameName;
+
             Uri uri;
-            if (!Uri.TryCreate(string.Format("ws://{0}:{1}/altws/game", host, port), UriKind.Absolute, out uri))
+
+            if (!Uri.TryCreate(string.Format("ws://{0}:{1}/altws/game?game={2}", host, port, Uri.EscapeUriString(gameName)), UriKind.Absolute, out uri))
             {
                 throw new Exception(String.Format("Invalid host or port {0}:{1}", host, port));
             }
@@ -25,10 +31,12 @@ public WebSocketClientCommunication(ICommandHandler cmdHandler, string host, int
             wsClient = new WebSocket(uri.ToString());
             wsClient.Log.Level = LogLevel.Fatal;
             websocketHandler = new AltClientWebSocketHandler(wsClient, cmdHandler);
+
             wsClient.OnOpen += (sender, message) =>
             {
                 if (this.OnConnect != null) this.OnConnect();
             };
+
             wsClient.OnClose += (sender, args) =>
             {
                 if (this.OnDisconnect != null) this.OnDisconnect();
diff --git a/Assets/AltTester/AltServer/Communication/WebSocketServerCommunication.cs b/Assets/AltTester/AltServer/Communication/WebSocketServerCommunication.cs
deleted file mode 100644
index 9cabd3664..000000000
--- a/Assets/AltTester/AltServer/Communication/WebSocketServerCommunication.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using Altom.AltTester.Logging;
-using AltWebSocketSharp.Server;
-
-namespace Altom.AltTester.Communication
-{
-    public class WebSocketServerCommunication : ICommunication
-    {
-        private static readonly NLog.Logger logger = ServerLogManager.Instance.GetCurrentClassLogger();
-
-        private readonly int port;
-        private readonly string host;
-
-        WebSocketServer wsServer;
-        AltServerWebSocketHandler wsHandler = null;
-
-        public WebSocketServerCommunication(ICommandHandler cmdHandler, string host, int port)
-        {
-            this.port = port;
-            this.host = host;
-            Uri uri;
-            if (!Uri.TryCreate(string.Format("ws://{0}:{1}/", host, port), UriKind.Absolute, out uri))
-            {
-                throw new Exception(String.Format("Invalid host or port {0}:{1}", host, port));
-            }
-
-            wsServer = new WebSocketServer(uri.ToString());
-            wsServer.AllowForwardedRequest = true;
-
-            wsServer.AddWebSocketService<AltServerWebSocketHandler>("/altws", (context, handler) =>
-            {
-                if (wsServer.WebSocketServices["/altws"].Sessions.Count == 1)
-                {
-                    throw new Exception("Driver already connected.");
-                }
-
-                handler.Init(cmdHandler);
-                this.wsHandler = handler;
-
-                this.wsHandler.OnErrorHandler += (message, exception) =>
-                {
-                    if (this.OnError != null) this.OnError.Invoke(message, exception);
-                };
-
-                this.wsHandler.OnClientConnected += () =>
-                {
-                    if (this.OnConnect != null) this.OnConnect.Invoke();
-                };
-
-                this.wsHandler.OnClientDisconnected += () =>
-                {
-                    if (this.OnDisconnect != null)
-                    {
-                        if (wsServer.WebSocketServices["/altws"].Sessions.Count == 0)
-                        {
-                            this.OnDisconnect();
-                        }
-                    }
-                };
-            });
-        }
-
-        public bool IsConnected { get { return wsServer.WebSocketServices["/altws"].Sessions.Count > 0; } }
-        public bool IsListening { get { return wsServer.IsListening; } }
-
-        public CommunicationHandler OnConnect { get; set; }
-        public CommunicationHandler OnDisconnect { get; set; }
-        public CommunicationErrorHandler OnError { get; set; }
-
-        public void Start()
-        {
-            try
-            {
-                if (!wsServer.IsListening)
-                {
-                    wsServer.Start();
-                }
-            }
-            catch (Exception ex)
-            {
-                if (ex is InvalidOperationException && ex.InnerException != null && (ex.InnerException.Message.Contains("Only one usage of each socket address") || ex.InnerException.Message.Contains("Address already in use")))
-                {
-                    string message = String.Format("Port {0} is in use by another program. Start AltTester with a different port.", port);
-
-                    throw new AddressInUseCommError(message);
-                }
-
-                logger.Error(ex.GetType().ToString(), ex.InnerException.Message);
-                throw new UnhandledStartCommError("An unexpected error occurred while starting AltTester.", ex);
-            }
-        }
-
-        public void Stop()
-        {
-            wsServer.Stop();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/AltTester/AltServer/Communication/WebSocketWebGlCommunication.cs b/Assets/AltTester/AltServer/Communication/WebSocketWebGlCommunication.cs
index 68df9456f..b0b46069f 100644
--- a/Assets/AltTester/AltServer/Communication/WebSocketWebGlCommunication.cs
+++ b/Assets/AltTester/AltServer/Communication/WebSocketWebGlCommunication.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using AOT;
 
-namespace Altom.AltTester.Communication
+namespace AltTester.Communication
 {
 #if UNITY_WEBGL
     public enum WebSocketCloseCode
diff --git a/Assets/AltTester/AltServer/FindObjectViaRayCast.cs b/Assets/AltTester/AltServer/FindObjectViaRayCast.cs
index 0759e3c81..81a5a9c4b 100644
--- a/Assets/AltTester/AltServer/FindObjectViaRayCast.cs
+++ b/Assets/AltTester/AltServer/FindObjectViaRayCast.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public class FindObjectViaRayCast
     {
diff --git a/Assets/AltTester/AltServer/Input.cs b/Assets/AltTester/AltServer/Input.cs
index 91577e675..3635cb254 100644
--- a/Assets/AltTester/AltServer/Input.cs
+++ b/Assets/AltTester/AltServer/Input.cs
@@ -4,9 +4,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Altom.AltDriver;
-using Altom.AltTester;
-using Altom.AltTester.InputModule;
+using AltTester.AltDriver;
+using AltTester;
+using AltTester.InputModule;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem.UI;
@@ -1517,7 +1517,7 @@ private static bool isEnglishLetter(char c)
     #endregion
 }
 
-namespace Altom.AltTester.InputModule
+namespace AltTester.InputModule
 {
 
     public class KeyStructure
@@ -1555,7 +1555,7 @@ public override string ToString()
 #else
             using UnityEngine;
 
-namespace Altom.AltTester.InputModule
+namespace AltTester.InputModule
 {
 
     public class Input : MonoBehaviour
diff --git a/Assets/AltTester/AltServer/InputController.cs b/Assets/AltTester/AltServer/InputController.cs
index 18e55cbc9..10177690f 100644
--- a/Assets/AltTester/AltServer/InputController.cs
+++ b/Assets/AltTester/AltServer/InputController.cs
@@ -2,10 +2,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using Altom.AltDriver;
+using AltTester.AltDriver;
 using UnityEngine;
 
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public static class InputController
     {
diff --git a/Assets/AltTester/AltServer/Logging/ServerLogManager.cs b/Assets/AltTester/AltServer/Logging/ServerLogManager.cs
index 3ad03e331..5b4942f62 100644
--- a/Assets/AltTester/AltServer/Logging/ServerLogManager.cs
+++ b/Assets/AltTester/AltServer/Logging/ServerLogManager.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 using NLog;
 using NLog.Config;
 using NLog.Layouts;
 using NLog.Targets;
 
-namespace Altom.AltTester.Logging
+namespace AltTester.Logging
 {
     public class ServerLogManager
     {
@@ -66,6 +66,7 @@ public static void SetMinLogLevel(AltLogger loggerType, AltLogLevel minLogLevel)
 
         private static void addFileLogger(LogLevel minLevel, LogLevel maxLevel)
         {
+#if !UNITY_WEBGL
             logsFilePath = UnityEngine.Application.persistentDataPath + "/AltTester-Server.log";
             var logfile = new FileTarget("AltServerFileTarget")
             {
@@ -77,6 +78,7 @@ private static void addFileLogger(LogLevel minLevel, LogLevel maxLevel)
             };
             Instance.Configuration.AddRule(minLevel, maxLevel, logfile);
             Instance.Configuration.LoggingRules[Instance.Configuration.LoggingRules.Count - 1].RuleName = "AltServerFileRule";
+#endif
         }
 
         private static LogFactory buildLogFactory()
diff --git a/Assets/AltTester/AltServer/NewInputSystem.cs b/Assets/AltTester/AltServer/NewInputSystem.cs
index 4fb477aed..55dd8bbc7 100644
--- a/Assets/AltTester/AltServer/NewInputSystem.cs
+++ b/Assets/AltTester/AltServer/NewInputSystem.cs
@@ -1,7 +1,7 @@
 #if ALTTESTER && ENABLE_INPUT_SYSTEM
 using System.Collections;
 using System.Collections.Generic;
-using Altom.AltTester;
+using AltTester;
 #if USE_INPUT_SYSTEM_1_3
 using NUnit.Framework;
 using NUnit.Framework.Interfaces;
@@ -11,7 +11,7 @@
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public class NewInputSystem : MonoBehaviour
     {
@@ -418,7 +418,7 @@ internal static IEnumerator EndTouch(int fingerId)
 
         }
 
-        #region private interface
+#region private interface
         private static ButtonControl keyCodeToButtonControl(KeyCode keyCode, float power = 1)
         {
             foreach (var e in AltKeyMapping.StringToKeyCode)
@@ -472,7 +472,7 @@ private static int getFreeTouch(bool[] touches)
             }
             return 0;
         }
-        #endregion
+#endregion
     }
 
 }
@@ -489,7 +489,7 @@ public void Test()
 #else
 using UnityEngine;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public class NewInputSystem : MonoBehaviour
     {
diff --git a/Assets/AltTester/AltServer/UI/AltDialog.cs b/Assets/AltTester/AltServer/UI/AltDialog.cs
index 7f8af6075..7d565e9a0 100644
--- a/Assets/AltTester/AltServer/UI/AltDialog.cs
+++ b/Assets/AltTester/AltServer/UI/AltDialog.cs
@@ -1,9 +1,10 @@
 using System;
-using Altom.AltTester;
-using Altom.AltTester.Communication;
-using Altom.AltTester.Logging;
+using System.Collections.Generic;
+using AltTester;
+using AltTester.Communication;
+using AltTester.Logging;
 
-namespace Altom.AltTester.UI
+namespace AltTester.UI
 {
     public class AltDialog : UnityEngine.MonoBehaviour
     {
@@ -13,7 +14,6 @@ public class AltDialog : UnityEngine.MonoBehaviour
         private readonly UnityEngine.Color WARNING_COLOR = new UnityEngine.Color32(255, 255, 95, 255);
         private readonly UnityEngine.Color ERROR_COLOR = new UnityEngine.Color32(191, 71, 85, 255);
 
-
         [UnityEngine.SerializeField]
         public UnityEngine.GameObject Dialog = null;
 
@@ -30,23 +30,27 @@ public class AltDialog : UnityEngine.MonoBehaviour
         public UnityEngine.UI.Image Icon = null;
 
         [UnityEngine.SerializeField]
-        public UnityEngine.UI.Text PortLabel = null;
+        public UnityEngine.UI.InputField HostInputField = null;
 
         [UnityEngine.SerializeField]
         public UnityEngine.UI.InputField PortInputField = null;
 
         [UnityEngine.SerializeField]
-        public UnityEngine.UI.Button RestartButton = null;
+        public UnityEngine.UI.InputField GameNameInputField = null;
 
         [UnityEngine.SerializeField]
+        public UnityEngine.UI.Button RestartButton = null;
         public UnityEngine.UI.Toggle CustomInputToggle = null;
 
         private ICommunication communication;
 
         public AltInstrumentationSettings InstrumentationSettings { get { return AltRunner._altRunner.InstrumentationSettings; } }
 
+        private ICommunication _communication;
         private readonly AltResponseQueue _updateQueue = new AltResponseQueue();
-        private bool wasConnectedBeforeToProxy = false;
+        private bool _wasConnectedBefore = false;
+
+        HashSet<string> _connectedDrivers = new HashSet<string>();
 
         public void Awake()
         {
@@ -55,17 +59,20 @@ public void Awake()
 
         protected void Start()
         {
+            Dialog.SetActive(InstrumentationSettings.ShowPopUp);
+
+            SetTitle("AltTester v." + AltRunner.VERSION);
+            SetUpCloseButton();
+            SetUpIcon();
+            SetUpHostInputField();
             SetUpPortInputField();
+            SetUpGameNameInputField();
             SetUpRestartButton();
 
-            Dialog.SetActive(InstrumentationSettings.ShowPopUp);
-            CloseButton.onClick.AddListener(ToggleDialog);
-            Icon.GetComponent<UnityEngine.UI.Button>().onClick.AddListener(ToggleDialog);
-            TitleText.text = "AltTester v." + AltRunner.VERSION;
+            StartClient();
             CustomInputToggle.onValueChanged.AddListener(ToggleInput);
-            CustomInputToggle.isOn=false;
+            CustomInputToggle.isOn = false;
 
-            StartAltTester();
         }
 
         protected void Update()
@@ -75,10 +82,37 @@ protected void Update()
 
         protected void OnApplicationQuit()
         {
-            cleanUp();
+            StopClient();
+        }
+
+        private void SetMessage(string message, UnityEngine.Color color, bool visible)
+        {
+            Dialog.SetActive(visible);
+            Dialog.GetComponent<UnityEngine.UI.Image>().color = color;
+            MessageText.text = message;
+        }
+
+        private void SetTitle(string title)
+        {
+            TitleText.text = title;
         }
 
-        public void OnPortInputFieldValueChange(string value)
+        private void ToggleDialog()
+        {
+            Dialog.SetActive(!Dialog.activeSelf);
+        }
+
+        private void SetUpCloseButton()
+        {
+            CloseButton.onClick.AddListener(ToggleDialog);
+        }
+
+        private void SetUpIcon()
+        {
+            Icon.GetComponent<UnityEngine.UI.Button>().onClick.AddListener(ToggleDialog);
+        }
+
+        private void OnPortInputFieldValueChange(string value)
         {
             // Allow only positive numbers.
             if (value == "-")
@@ -87,36 +121,67 @@ public void OnPortInputFieldValueChange(string value)
             }
         }
 
-        public void SetUpPortInputField()
+        private void SetUpHostInputField()
+        {
+            HostInputField.text = InstrumentationSettings.ProxyHost;
+        }
+
+        private void SetUpPortInputField()
         {
-            PortInputField.text = InstrumentationSettings.AltTesterPort.ToString();
+            PortInputField.text = InstrumentationSettings.ProxyPort.ToString();
             PortInputField.onValueChanged.AddListener(OnPortInputFieldValueChange);
             PortInputField.characterValidation = UnityEngine.UI.InputField.CharacterValidation.Integer;
         }
 
+        private void SetUpGameNameInputField()
+        {
+            GameNameInputField.text = InstrumentationSettings.GameName;
+        }
+
         private void OnRestartButtonPress()
         {
-            logger.Debug("Restart the AltTester.");
+            logger.Debug("Restart the AltTester client.");
+            StopClient();
+
+            if (Uri.CheckHostName(HostInputField.text) != UriHostNameType.Unknown)
+            {
+                InstrumentationSettings.ProxyHost = HostInputField.text;
+            }
+            else
+            {
+                SetMessage("The host should be a valid host.", ERROR_COLOR, true);
+                return;
+            }
 
             int port;
             if (Int32.TryParse(PortInputField.text, out port) && port > 0 && port <= 65535)
             {
-                InstrumentationSettings.AltTesterPort = port;
+                InstrumentationSettings.ProxyPort = port;
+            }
+            else
+            {
+                SetMessage("The port number should be beteween 1 and 65535.", ERROR_COLOR, true);
+                return;
+            }
+
+            if (!string.IsNullOrEmpty(GameNameInputField.text))
+            {
+                InstrumentationSettings.GameName = GameNameInputField.text;
             }
             else
             {
-                setDialog("The port number should be beteween 1 and 65535.", ERROR_COLOR, true);
+                SetMessage("Game name should not be empty.", ERROR_COLOR, true);
                 return;
             }
 
             try
             {
-                RestartAltTester();
+                StartClient();
             }
             catch (Exception ex)
             {
-                setDialog("An unexpected error occurred while restarting the AltTester.", ERROR_COLOR, true);
-                logger.Error("An unexpected error occurred while restarting the AltTester.");
+                SetMessage("An unexpected error occurred while restarting the AltTester client.", ERROR_COLOR, true);
+                logger.Error("An unexpected error occurred while restarting the AltTester client.");
                 logger.Error(ex.GetType().ToString(), ex.Message);
             }
         }
@@ -126,10 +191,6 @@ public void SetUpRestartButton()
             RestartButton.onClick.AddListener(OnRestartButtonPress);
         }
 
-        public void ToggleDialog()
-        {
-            Dialog.SetActive(!Dialog.activeSelf);
-        }
 
         public void ToggleInput(bool value)
         {
@@ -155,163 +216,155 @@ private void setDialog(string message, UnityEngine.Color color, bool visible)
             Dialog.GetComponent<UnityEngine.UI.Image>().color = color;
         }
 
-        private void StartAltTester()
-        {
-            if (InstrumentationSettings.InstrumentationMode == AltInstrumentationMode.Server)
-            {
-                startServerCommProtocol();
-            }
-            else
-            {
-                startProxyCommProtocol();
-            }
-        }
 
-        private void StopAltTester()
-        {
-            logger.Debug("Stopping AltTester.");
-            if (communication != null)
-            {
-                communication.Stop();
-            }
-        }
-
-        private void RestartAltTester()
-        {
-            StopAltTester();
-            StartAltTester();
-        }
-
-        private void startServerCommProtocol()
-        {
-            var cmdHandler = new CommandHandler();
-            communication = new WebSocketServerCommunication(cmdHandler, "0.0.0.0", InstrumentationSettings.AltTesterPort);
-            communication.OnConnect += onClientConnected;
-            communication.OnDisconnect += onClientDisconnected;
-            communication.OnError += onError;
-
-            setDialog("Starting AltTester on port: " + InstrumentationSettings.AltTesterPort, WARNING_COLOR, true);
-
-            try
-            {
-                communication.Start();
-                setDialog("Waiting for connection on port: " + InstrumentationSettings.AltTesterPort, SUCCESS_COLOR, true);
-            }
-            catch (AddressInUseCommError ex)
-            {
-                setDialog(ex.Message, ERROR_COLOR, true);
-                logger.Error(ex.Message);
-            }
-            catch (UnhandledStartCommError ex)
-            {
-                setDialog(ex.Message, ERROR_COLOR, true);
-                logger.Error(ex.InnerException, ex.InnerException.Message);
-            }
-        }
-
-        private void onClientConnected()
-        {
-            string message = "Client connected.";
-
-            _updateQueue.ScheduleResponse(() =>
-            {
-                CustomInputToggle.isOn = true;
-                setDialog(message, SUCCESS_COLOR, false);
-            });
-        }
-
-        private void onClientDisconnected()
-        {
-
-            if (!communication.IsConnected) //
-                _updateQueue.ScheduleResponse(() =>
-                {
-                    CustomInputToggle.isOn = false;
-                    setDialog("Waiting for connections on port: " + InstrumentationSettings.AltTesterPort, SUCCESS_COLOR, false);
-                });
-        }
 
         #region proxy mode comm protocol
 
-        private void initProxyCommProtocol()
+        private void initClient()
         {
             var cmdHandler = new CommandHandler();
+            cmdHandler.OnDriverConnect += OnDriverConnect;
+            cmdHandler.OnDriverDisconnect += OnDriverDisconnect;
 
 #if UNITY_WEBGL && !UNITY_EDITOR
-                    communication = new WebSocketWebGLCommunication(cmdHandler, InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort);
+            _communication = new WebSocketWebGLCommunication(cmdHandler, InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort);
 #else
-
-            communication = new WebSocketClientCommunication(cmdHandler, InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort);
+            _communication = new WebSocketClientCommunication(cmdHandler, InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort, InstrumentationSettings.GameName);
 #endif
-            communication.OnConnect += onProxyConnect;
-            communication.OnDisconnect += onProxyDisconnect;
-            communication.OnError += onError;
 
+            _communication.OnConnect += OnConnect;
+            _communication.OnDisconnect += OnDisconnect;
+            _communication.OnError += OnError;
         }
 
-        private void startProxyCommProtocol()
+        private void StartClient()
         {
-            initProxyCommProtocol();
-
+            initClient();
             try
             {
-                if (communication == null || !communication.IsListening) // start only if it is not already listening
-                    communication.Start();
-
-                if (!communication.IsConnected) // display dialog only if not connected
-                    onStart();
+                if (_communication == null || !_communication.IsListening) // Start only if it is not already listening
+                {
+                    _communication.Start();
+                }
+                if (!_communication.IsConnected) // Display dialog only if not connected
+                {
+                    OnStart();
+                }
             }
             catch (UnhandledStartCommError ex)
             {
-                setDialog("An unexpected error occurred while starting the communication protocol.", ERROR_COLOR, true);
+                SetMessage("An unexpected error occurred while starting the communication protocol.", ERROR_COLOR, true);
                 logger.Error(ex.InnerException, "An unexpected error occurred while starting the communication protocol.");
             }
             catch (Exception ex)
             {
-                setDialog("An unexpected error occurred while starting the communication protocol.", ERROR_COLOR, true);
+                SetMessage("An unexpected error occurred while starting the communication protocol.", ERROR_COLOR, true);
                 logger.Error(ex, "An unexpected error occurred while starting the communication protocol.");
             }
         }
 
-        private void onStart()
+        private void StopClient()
         {
-            setDialog("Connecting to AltProxy on " + InstrumentationSettings.ProxyHost + ":" + InstrumentationSettings.ProxyPort, SUCCESS_COLOR, Dialog.activeSelf || wasConnectedBeforeToProxy);
-            wasConnectedBeforeToProxy = false;
+            _updateQueue.Clear();
+
+            if (_communication != null)
+            {
+                // Remove the callbacks before stopping the client to prevent the OnDisconnect callback to be called when we stop or restart the client.
+                _communication.OnConnect = null;
+                _communication.OnDisconnect = null;
+                _communication.OnError = null;
+
+                _communication.Stop();
+                _communication = null;
+            }
         }
 
-        private void onProxyConnect()
+        private void OnStart()
         {
-            string message = "Connected to AltProxy on " + InstrumentationSettings.ProxyHost + ":" + InstrumentationSettings.ProxyPort;
+            string message = String.Format("Waiting to connect to AltProxy on {0}:{1} with game name: '{2}'.", InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort, InstrumentationSettings.GameName);
+            SetMessage(message, SUCCESS_COLOR, Dialog.activeSelf || _wasConnectedBefore);
+
+            _wasConnectedBefore = false;
+        }
+
+        private void OnConnect()
+        {
+            string message = String.Format("Connected to AltProxy on {0}:{1} with game name: '{2}'. Waiting for Driver to connect.", InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort, InstrumentationSettings.GameName);
+
             _updateQueue.ScheduleResponse(() =>
             {
-                setDialog(message, SUCCESS_COLOR, false);
-                wasConnectedBeforeToProxy = true;
+                SetMessage(message, SUCCESS_COLOR, true);
+                _wasConnectedBefore = true;
             });
         }
 
-        private void onProxyDisconnect()
+        private void OnDisconnect()
         {
-            _updateQueue.ScheduleResponse(startProxyCommProtocol);
+            _updateQueue.ScheduleResponse(() =>
+            {
+                StartClient();
+            });
         }
 
-        #endregion
-
-        private void onError(string message, Exception ex)
+        private void OnError(string message, Exception ex)
         {
             logger.Error(message);
+
             if (ex != null)
             {
                 logger.Error(ex);
             }
         }
 
-        private void cleanUp()
+        #endregion
+        private void OnDriverConnect(string driverId)
+        {
+            logger.Debug("Driver Connected: " + driverId);
+            string message = String.Format("Connected to AltProxy on {0}:{1} with game name: '{2}'. Driver connected.", InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort, InstrumentationSettings.GameName);
+
+            _connectedDrivers.Add(driverId);
+
+            if (_connectedDrivers.Count == 1)
+            {
+#if ALTTESTER && ENABLE_LEGACY_INPUT_MANAGER
+                Input.UseCustomInput = true;
+                UnityEngine.Debug.Log("Custom input: " + Input.UseCustomInput);
+#endif
+
+                _updateQueue.ScheduleResponse(() =>
+                {
+                    SetMessage(message, SUCCESS_COLOR, false);
+
+#if ALTTESTER && ENABLE_INPUT_SYSTEM
+                    NewInputSystem.DisableDefaultDevicesAndEnableAltDevices();
+#endif
+                });
+            }
+        }
+
+        private void OnDriverDisconnect(string driverId)
         {
-            logger.Debug("Stopping communication protocol");
-            if (communication != null)
+            logger.Debug("Driver Disconect: " + driverId);
+            string message = String.Format("Connected to AltProxy on {0}:{1} with game name: '{2}'. Waiting for Driver to connect.", InstrumentationSettings.ProxyHost, InstrumentationSettings.ProxyPort, InstrumentationSettings.GameName);
+
+            _connectedDrivers.Remove(driverId);
+
+            if (_connectedDrivers.Count == 0)
             {
-                communication.Stop();
+#if ALTTESTER && ENABLE_LEGACY_INPUT_MANAGER
+                Input.UseCustomInput = false;
+                UnityEngine.Debug.Log("Custom input: " + Input.UseCustomInput);
+#endif
+
+                _updateQueue.ScheduleResponse(() =>
+                {
+                    SetMessage(message, SUCCESS_COLOR, true);
+
+#if ALTTESTER && ENABLE_INPUT_SYSTEM
+                    NewInputSystem.EnableDefaultDevicesAndDisableAltDevices();
+#endif
+                });
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/AltTester/AltServer/UnityStruct/AltVector.cs b/Assets/AltTester/AltServer/UnityStruct/AltVector.cs
index 683e0f4b1..dfdeba1f6 100644
--- a/Assets/AltTester/AltServer/UnityStruct/AltVector.cs
+++ b/Assets/AltTester/AltServer/UnityStruct/AltVector.cs
@@ -1,6 +1,6 @@
-using Altom.AltDriver;
+using AltTester.AltDriver;
 
-namespace Altom.AltTester
+namespace AltTester
 {
     public static class AltVectorExtensions
     {
diff --git a/Assets/AltTester/Editor/AltBuilder.cs b/Assets/AltTester/Editor/AltBuilder.cs
index bb4b171b8..48aa7e778 100644
--- a/Assets/AltTester/Editor/AltBuilder.cs
+++ b/Assets/AltTester/Editor/AltBuilder.cs
@@ -1,440 +1,453 @@
-using System.Collections.Generic;
-using System.IO;
-using Altom.AltDriver;
-using Altom.AltTester;
-using Altom.AltTesterEditor.Logging;
-using UnityEditor;
-using UnityEditor.SceneManagement;
-using UnityEngine;
-
-namespace Altom.AltTesterEditor
-{
-    public static class PlatformName
-    {
-        public const string Android = "Android";
-        public const string iOS = "iOS";
-        public const string Standalone = "Standalone";
-    }
-
-
-    public class AltBuilder
-    {
-        private const string ALTTESTERDEFINE = "ALTTESTER";
-        private const string PREFABNAME = "AltTesterPrefab";
-        private static readonly NLog.Logger logger = EditorLogManager.Instance.GetCurrentClassLogger();
-        public enum InputType
-        {
-            KeyOrMouseButton,
-            MouseMovement,
-            JoystickAxis,
-        };
-
-        public static bool Built = false;
-        public static string PreviousScenePath;
-        public static UnityEngine.SceneManagement.Scene SceneWithAltRunner;
-        public static UnityEngine.Object AltRunner;
-
-        public static void InitBuildSetup(UnityEditor.BuildTargetGroup buildTargetGroup)
-        {
-            AltTesterEditorWindow.InitEditorConfiguration();
-
-            if (AltTesterEditorWindow.EditorConfiguration.appendToName)
-            {
-                UnityEditor.PlayerSettings.productName = UnityEditor.PlayerSettings.productName + "Test";
-                string bundleIdentifier = UnityEditor.PlayerSettings.GetApplicationIdentifier(buildTargetGroup) + "Test";
-                UnityEditor.PlayerSettings.SetApplicationIdentifier(buildTargetGroup, bundleIdentifier);
-            }
-            AddAltTesterInScriptingDefineSymbolsGroup(buildTargetGroup);
-            if (buildTargetGroup == UnityEditor.BuildTargetGroup.Standalone)
-                CreateJsonFileForInputMappingOfAxis();
-
-        }
-
-        public static void BuildAndroidFromUI(bool autoRun = false)
-        {
-            try
-            {
-                InitBuildSetup(UnityEditor.BuildTargetGroup.Android);
-                logger.Debug("Starting Android build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
-
-                var buildPlayerOptions = new UnityEditor.BuildPlayerOptions
-                {
-                    locationPathName = getOutputPath(UnityEditor.BuildTarget.Android),
-                    scenes = getScenesForBuild(),
-                    target = UnityEditor.BuildTarget.Android
-                };
-
-                buildGame(autoRun, buildPlayerOptions);
-            }
-            catch (System.Exception e)
-            {
-                logger.Error(e);
-            }
-            finally
-            {
-                Built = true;
-                resetBuildSetup(UnityEditor.BuildTargetGroup.Android);
-            }
-        }
-
-        public static void BuildWebGLFromUI(bool autoRun = false)
-        {
-            try
-            {
-                InitBuildSetup(UnityEditor.BuildTargetGroup.WebGL);
-                logger.Debug("Starting WebGL build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
-
-                var buildPlayerOptions = new UnityEditor.BuildPlayerOptions
-                {
-                    locationPathName = getOutputPath(UnityEditor.BuildTarget.WebGL),
-                    scenes = getScenesForBuild(),
-                    target = UnityEditor.BuildTarget.WebGL,
-                    targetGroup = UnityEditor.BuildTargetGroup.WebGL
-                };
-
-                buildGame(autoRun, buildPlayerOptions);
-            }
-            catch (System.Exception e)
-            {
-                logger.Error(e);
-            }
-            finally
-            {
-                Built = true;
-                resetBuildSetup(UnityEditor.BuildTargetGroup.Android);
-            }
-
-        }
-
-        public static void BuildStandaloneFromUI(UnityEditor.BuildTarget buildTarget, bool autoRun = false)
-        {
-            try
-            {
-                InitBuildSetup(UnityEditor.BuildTargetGroup.Standalone);
-                logger.Debug("Starting Standalone build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
-
-                UnityEditor.BuildPlayerOptions buildPlayerOptions = new UnityEditor.BuildPlayerOptions
-                {
-                    locationPathName = getOutputPath(buildTarget),
-                    scenes = getScenesForBuild(),
-                    target = buildTarget
-                };
-
-                buildGame(autoRun, buildPlayerOptions);
-            }
-            catch (System.Exception e)
-            {
-                logger.Error(e);
-            }
-            finally
-            {
-                Built = true;
-                resetBuildSetup(UnityEditor.BuildTargetGroup.Standalone);
-            }
-
-        }
-
-        public static void RemoveAltTesterFromScriptingDefineSymbols(UnityEditor.BuildTargetGroup targetGroup)
-        {
-            if (AltTesterEditorWindow.EditorConfiguration != null && AltTesterEditorWindow.EditorConfiguration.KeepAUTSymbolDefined)
-                return;
-            try
-            {
-                var scriptingDefineSymbolsForGroup =
-                    UnityEditor.PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup);
-                string newScriptingDefineSymbolsForGroup = "";
-                if (scriptingDefineSymbolsForGroup.Contains(ALTTESTERDEFINE))
-                {
-                    var split = scriptingDefineSymbolsForGroup.Split(';');
-                    foreach (var define in split)
-                    {
-                        if (define != ALTTESTERDEFINE)
-                        {
-                            newScriptingDefineSymbolsForGroup += define + ";";
-                        }
-                    }
-                    if (newScriptingDefineSymbolsForGroup.Length != 0)
-                        newScriptingDefineSymbolsForGroup.Remove(newScriptingDefineSymbolsForGroup.Length - 1);
-                    UnityEditor.PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup,
-                        newScriptingDefineSymbolsForGroup);
-                }
-            }
-            catch (System.Exception e)
-            {
-                logger.Error("Some Error Happened +" + e.Message);
-                logger.Error("Stack trace " + e.StackTrace);
-            }
-        }
-
-        public static void AddAltTesterInScriptingDefineSymbolsGroup(BuildTargetGroup targetGroup)
-        {
-            var scriptingDefineSymbolsForGroup = PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup);
-            if (scriptingDefineSymbolsForGroup.Contains(ALTTESTERDEFINE))
-                return;
-            scriptingDefineSymbolsForGroup += ";" + ALTTESTERDEFINE;
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup, scriptingDefineSymbolsForGroup);
-        }
-
-        [System.Obsolete("Use AddAltTesterInScriptingDefineSymbolsGroup instead.")]
-        public static void AddAltTesterInScritpingDefineSymbolsGroup(UnityEditor.BuildTargetGroup targetGroup)
-        {
-            AddAltTesterInScriptingDefineSymbolsGroup(targetGroup);
-        }
-
-        public static bool CheckAltTesterIsDefineAsAScriptingSymbol(UnityEditor.BuildTargetGroup targetGroup)
-        {
-            return PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup).Contains(ALTTESTERDEFINE);
-        }
-
-        public static void CreateJsonFileForInputMappingOfAxis()
-        {
-            string gameDataProjectFilePath = "/Resources/AltTester/AltTesterInputAxisData.json";
-            var inputManager = UnityEditor.AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/InputManager.asset")[0];
-            var obj = new UnityEditor.SerializedObject(inputManager);
-
-            UnityEditor.SerializedProperty axisArray = obj.FindProperty("m_Axes");
-
-            if (axisArray.arraySize == 0)
-                logger.Info("No Axes");
-            var axisList = new List<AltAxis>();
-            for (int i = 0; i < axisArray.arraySize; ++i)
-            {
-                var axis = axisArray.GetArrayElementAtIndex(i);
-
-                var name = axis.FindPropertyRelative("m_Name").stringValue;
-                var inputType = (InputType)axis.FindPropertyRelative("type").intValue;
-                var negativeButton = axis.FindPropertyRelative("negativeButton").stringValue;
-                var positiveButton = axis.FindPropertyRelative("positiveButton").stringValue;
-                var altPositiveButton = axis.FindPropertyRelative("altPositiveButton").stringValue;
-                var altNegativeButton = axis.FindPropertyRelative("altNegativeButton").stringValue;
-                axisList.Add(new AltAxis(name, negativeButton, positiveButton, altPositiveButton, altNegativeButton));
-            }
-
-            string dataAsJson = Newtonsoft.Json.JsonConvert.SerializeObject(axisList);
-            string filePath = Application.dataPath + gameDataProjectFilePath;
-            if (!UnityEditor.AssetDatabase.IsValidFolder("Assets/Resources/AltTester"))
-            {
-                if (!UnityEditor.AssetDatabase.IsValidFolder("Assets/Resources"))
-                {
-                    UnityEditor.AssetDatabase.CreateFolder("Assets", "Resources");
-                }
-                UnityEditor.AssetDatabase.CreateFolder("Assets/Resources", "AltTester");
-            }
-            using (StreamWriter sw = new StreamWriter(filePath))
-            {
-                sw.Write(dataAsJson);
-            }
-            UnityEditor.AssetDatabase.Refresh();
-        }
-
-        public static void InsertAltInScene(string scene, AltInstrumentationSettings instrumentationSettings)
-        {
-            logger.Debug("Adding AltTesterPrefab into the [" + scene + "] scene.");
-            var altRunner = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(UnityEditor.AssetDatabase.GUIDToAssetPath(UnityEditor.AssetDatabase.FindAssets(PREFABNAME)[0]));
-
-            SceneWithAltRunner = EditorSceneManager.OpenScene(scene);
-            AltRunner = UnityEditor.PrefabUtility.InstantiatePrefab(altRunner);
-            var altRunnerComponent = ((GameObject)AltRunner).GetComponent<AltRunner>();
-            altRunnerComponent.InstrumentationSettings = instrumentationSettings;
-
-            EditorSceneManager.MarkSceneDirty(UnityEngine.SceneManagement.SceneManager.GetActiveScene());
-            EditorSceneManager.SaveOpenScenes();
-            logger.Info("AltTesterPrefab successfully modified into the [" + scene + "] scene.");
-        }
-
-        public static void InsertAltInTheActiveScene(AltInstrumentationSettings instrumentationSettings)
-        {
-            var activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene().path;
-            InsertAltInScene(activeScene, instrumentationSettings);
-        }
-
-        public static void InsertAltInTheFirstScene(AltInstrumentationSettings instrumentationSettings)
-        {
-            var altRunner = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(UnityEditor.AssetDatabase.GUIDToAssetPath(UnityEditor.AssetDatabase.FindAssets(PREFABNAME)[0]));
-
-            PreviousScenePath = UnityEngine.SceneManagement.SceneManager.GetActiveScene().path;
-            SceneWithAltRunner = EditorSceneManager.OpenScene(GetFirstSceneWhichWillBeBuilt());
-
-            AltRunner = UnityEditor.PrefabUtility.InstantiatePrefab(altRunner);
-            AltRunner altRunnerComponent = ((UnityEngine.GameObject)AltRunner).GetComponent<AltRunner>();
-            altRunnerComponent.InstrumentationSettings = instrumentationSettings;
-
-
-            EditorSceneManager.MarkSceneDirty(UnityEngine.SceneManagement.SceneManager.GetActiveScene());
-            EditorSceneManager.SaveOpenScenes();
-
-            try
-            {
-                EditorSceneManager.OpenScene(PreviousScenePath);
-            }
-            catch
-            {
-                logger.Info("No scene was loaded yet.");
-            }
-        }
-
-        public static string GetFirstSceneWhichWillBeBuilt()
-        {
-            foreach (var scene in AltTesterEditorWindow.EditorConfiguration.Scenes)
-            {
-                if (scene.ToBeBuilt)
-                {
-                    return scene.Path;
-                }
-            }
-
-            return "";
-        }
-
-#if UNITY_EDITOR_OSX
-
-
-        public static void BuildiOSFromUI(bool autoRun)
-        {
-            try
-            {
-                InitBuildSetup(UnityEditor.BuildTargetGroup.iOS);
-                logger.Debug("Starting IOS build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
-                UnityEditor.BuildPlayerOptions buildPlayerOptions = new UnityEditor.BuildPlayerOptions();
-                buildPlayerOptions.locationPathName = getOutputPath(UnityEditor.BuildTarget.iOS);
-                buildPlayerOptions.scenes = getScenesForBuild();
-
-                buildPlayerOptions.target = UnityEditor.BuildTarget.iOS;
-                buildGame(autoRun, buildPlayerOptions);
-
-            }
-            catch (System.Exception e)
-            {
-                logger.Error(e);
-            }
-            finally
-            {
-                Built = true;
-                resetBuildSetup(UnityEditor.BuildTargetGroup.iOS);
-            }
-
-        }
-#endif
-
-        private static string getOutputPath(UnityEditor.BuildTarget target)
-        {
-            var outputPath = AltTesterEditorWindow.EditorConfiguration.BuildLocationPath;
-
-            outputPath = string.IsNullOrEmpty(outputPath) ? "build" : outputPath;
-            outputPath = System.IO.Path.Combine(outputPath, UnityEditor.PlayerSettings.productName);
-
-            switch (target)
-            {
-                case UnityEditor.BuildTarget.Android:
-                    if (!outputPath.EndsWith(".apk"))
-                    {
-                        outputPath = outputPath + ".apk";
-                    }
-
-                    break;
-                case UnityEditor.BuildTarget.StandaloneOSX:
-                    if (!outputPath.EndsWith(".app"))
-                    {
-                        outputPath = outputPath + ".app";
-                    }
-                    break;
-                case UnityEditor.BuildTarget.StandaloneWindows:
-                case UnityEditor.BuildTarget.StandaloneWindows64:
-                    if (!outputPath.EndsWith(".exe"))
-                    {
-                        outputPath = outputPath + ".exe";
-                    }
-                    break;
-                case UnityEditor.BuildTarget.StandaloneLinux64:
-                    if (!outputPath.EndsWith(".x86_64"))
-                    {
-                        outputPath = outputPath + ".x86_64";
-                    }
-                    break;
-
-                case UnityEditor.BuildTarget.iOS:
-                default:
-                    break;
-
-            }
-
-            return outputPath;
-        }
-
-        private static void resetBuildSetup(UnityEditor.BuildTargetGroup buildTargetGroup)
-        {
-            if (AltTesterEditorWindow.EditorConfiguration.appendToName)
-            {
-                UnityEditor.PlayerSettings.productName = UnityEditor.PlayerSettings.productName.Remove(UnityEditor.PlayerSettings.productName.Length - 5);
-                string bundleIdentifier = UnityEditor.PlayerSettings.GetApplicationIdentifier(buildTargetGroup).Remove(UnityEditor.PlayerSettings.GetApplicationIdentifier(buildTargetGroup).Length - 5);
-                UnityEditor.PlayerSettings.SetApplicationIdentifier(buildTargetGroup, bundleIdentifier);
-            }
-
-            RemoveAltTesterFromScriptingDefineSymbols(buildTargetGroup);
-        }
-
-        private static void buildGame(bool autoRun, UnityEditor.BuildPlayerOptions buildPlayerOptions)
-        {
-            UnityEditor.PlayerSettings.SetStackTraceLogType(LogType.Log, StackTraceLogType.None);
-            UnityEditor.PlayerSettings.SetStackTraceLogType(LogType.Warning, StackTraceLogType.None);
-            UnityEditor.PlayerSettings.SetStackTraceLogType(LogType.Assert, StackTraceLogType.None);
-
-            if (autoRun)
-            {
-                buildPlayerOptions.options = UnityEditor.BuildOptions.Development | UnityEditor.BuildOptions.AutoRunPlayer | UnityEditor.BuildOptions.IncludeTestAssemblies;
-            }
-            else
-            {
-                buildPlayerOptions.options = UnityEditor.BuildOptions.Development | UnityEditor.BuildOptions.ShowBuiltPlayer | UnityEditor.BuildOptions.IncludeTestAssemblies;
-            }
-            var results = UnityEditor.BuildPipeline.BuildPlayer(buildPlayerOptions);
-
-
-#if UNITY_2017
-            if (results.Equals(""))
-            {
-                logger.Info("Build path: " + buildPlayerOptions.locationPathName);
-                logger.Info("Build " + UnityEditor.PlayerSettings.productName + ":" + UnityEditor.PlayerSettings.bundleVersion + " Succeeded");
-            }
-            else
-            {
-                logger.Error("Build Error!");
-            }
-
-#else
-            if (results.summary.totalErrors == 0 || results.summary.result == UnityEditor.Build.Reporting.BuildResult.Succeeded)
-            {
-                logger.Info("Build path: " + buildPlayerOptions.locationPathName);
-                logger.Info("Build " + UnityEditor.PlayerSettings.productName + ":" + UnityEditor.PlayerSettings.bundleVersion + " Succeeded");
-            }
-            else
-            {
-                logger.Error("Build Error! " + results.steps + "\n Result: " + results.summary.result +
-                           "\n Stripping info: " + results.strippingInfo);
-            }
-#endif
-
-        }
-
-        private static string[] getScenesForBuild()
-        {
-            if (AltTesterEditorWindow.EditorConfiguration.Scenes.Count == 0)
-            {
-                AltTesterEditorWindow.AddAllScenes();
-                AltTesterEditorWindow.SelectAllScenes();
-            }
-            var sceneList = new List<string>();
-            foreach (var scene in AltTesterEditorWindow.EditorConfiguration.Scenes)
-            {
-                if (scene.ToBeBuilt)
-                {
-                    sceneList.Add(scene.Path);
-                }
-            }
-
-            InsertAltInTheFirstScene(AltTesterEditorWindow.EditorConfiguration.GetInstrumentationSettings());
-
-            return sceneList.ToArray();
-        }
-    }
+using System.Collections.Generic;
+using System.IO;
+using AltTester;
+using AltTester.AltDriver;
+using AltTesterEditor;
+using AltTesterEditor.Logging;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+
+namespace AltTesterEditor
+{
+    public static class PlatformName
+    {
+        public const string Android = "Android";
+        public const string iOS = "iOS";
+        public const string Standalone = "Standalone";
+    }
+
+
+    public class AltBuilder
+    {
+        private const string ALTTESTERDEFINE = "ALTTESTER";
+        private const string PREFABNAME = "AltTesterPrefab";
+        private const string WEBGLDEFINE = "UNITY_WEBGL";
+
+        private static readonly NLog.Logger logger = EditorLogManager.Instance.GetCurrentClassLogger();
+        public enum InputType
+        {
+            KeyOrMouseButton,
+            MouseMovement,
+            JoystickAxis,
+        };
+
+        public static bool Built = false;
+        public static string PreviousScenePath;
+        public static UnityEngine.SceneManagement.Scene SceneWithAltRunner;
+        public static UnityEngine.Object AltRunner;
+
+        public static void InitBuildSetup(UnityEditor.BuildTargetGroup buildTargetGroup)
+        {
+            AltTesterEditorWindow.InitEditorConfiguration();
+
+            if (AltTesterEditorWindow.EditorConfiguration.appendToName)
+            {
+                UnityEditor.PlayerSettings.productName = UnityEditor.PlayerSettings.productName + "Test";
+                string bundleIdentifier = UnityEditor.PlayerSettings.GetApplicationIdentifier(buildTargetGroup) + "Test";
+                UnityEditor.PlayerSettings.SetApplicationIdentifier(buildTargetGroup, bundleIdentifier);
+            }
+            AddAltTesterInScriptingDefineSymbolsGroup(buildTargetGroup);
+            if (buildTargetGroup == UnityEditor.BuildTargetGroup.Standalone)
+                CreateJsonFileForInputMappingOfAxis();
+
+        }
+
+        public static void BuildAndroidFromUI(bool autoRun = false)
+        {
+            try
+            {
+                InitBuildSetup(UnityEditor.BuildTargetGroup.Android);
+                logger.Debug("Starting Android build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
+
+                var buildPlayerOptions = new UnityEditor.BuildPlayerOptions
+                {
+                    locationPathName = getOutputPath(UnityEditor.BuildTarget.Android),
+                    scenes = getScenesForBuild(),
+                    target = UnityEditor.BuildTarget.Android
+                };
+
+                buildGame(autoRun, buildPlayerOptions);
+            }
+            catch (System.Exception e)
+            {
+                logger.Error(e);
+            }
+            finally
+            {
+                Built = true;
+                resetBuildSetup(UnityEditor.BuildTargetGroup.Android);
+            }
+        }
+
+        public static void BuildWebGLFromUI(bool autoRun = false)
+        {
+            try
+            {
+                InitBuildSetup(UnityEditor.BuildTargetGroup.WebGL);
+                logger.Debug("Starting WebGL build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
+
+                var buildPlayerOptions = new UnityEditor.BuildPlayerOptions
+                {
+                    locationPathName = getOutputPath(UnityEditor.BuildTarget.WebGL),
+                    scenes = getScenesForBuild(),
+                    target = UnityEditor.BuildTarget.WebGL,
+                    targetGroup = UnityEditor.BuildTargetGroup.WebGL
+                };
+
+                buildGame(autoRun, buildPlayerOptions);
+            }
+            catch (System.Exception e)
+            {
+                logger.Error(e);
+            }
+            finally
+            {
+                Built = true;
+                resetBuildSetup(UnityEditor.BuildTargetGroup.Android);
+            }
+
+        }
+
+        public static void BuildStandaloneFromUI(UnityEditor.BuildTarget buildTarget, bool autoRun = false)
+        {
+            try
+            {
+                InitBuildSetup(UnityEditor.BuildTargetGroup.Standalone);
+                logger.Debug("Starting Standalone build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
+
+                UnityEditor.BuildPlayerOptions buildPlayerOptions = new UnityEditor.BuildPlayerOptions
+                {
+                    locationPathName = getOutputPath(buildTarget),
+                    scenes = getScenesForBuild(),
+                    target = buildTarget
+                };
+
+                buildGame(autoRun, buildPlayerOptions);
+            }
+            catch (System.Exception e)
+            {
+                logger.Error(e);
+            }
+            finally
+            {
+                Built = true;
+                resetBuildSetup(UnityEditor.BuildTargetGroup.Standalone);
+            }
+
+        }
+
+        public static void RemoveAltTesterFromScriptingDefineSymbols(UnityEditor.BuildTargetGroup targetGroup)
+        {
+            RemoveScriptingDefineSymbol(ALTTESTERDEFINE, targetGroup);
+        }
+        public static void RemoveScriptingDefineSymbol(string symbol, UnityEditor.BuildTargetGroup targetGroup)
+        {
+            if (AltTesterEditorWindow.EditorConfiguration != null && AltTesterEditorWindow.EditorConfiguration.KeepAUTSymbolDefined)
+                return;
+            try
+            {
+                var scriptingDefineSymbolsForGroup =
+                    UnityEditor.PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup);
+                string newScriptingDefineSymbolsForGroup = "";
+                if (scriptingDefineSymbolsForGroup.Contains(symbol))
+                {
+                    var split = scriptingDefineSymbolsForGroup.Split(';');
+                    foreach (var define in split)
+                    {
+                        if (define != symbol)
+                        {
+                            newScriptingDefineSymbolsForGroup += define + ";";
+                        }
+                    }
+                    if (newScriptingDefineSymbolsForGroup.Length != 0)
+                        newScriptingDefineSymbolsForGroup.Remove(newScriptingDefineSymbolsForGroup.Length - 1);
+                    UnityEditor.PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup,
+                        newScriptingDefineSymbolsForGroup);
+                }
+            }
+            catch (System.Exception e)
+            {
+                logger.Error("Some Error Happened +" + e.Message);
+                logger.Error("Stack trace " + e.StackTrace);
+            }
+        }
+
+        public static void AddAltTesterInScriptingDefineSymbolsGroup(UnityEditor.BuildTargetGroup targetGroup)
+        {
+            AddScriptingDefineSymbol(ALTTESTERDEFINE, targetGroup);
+        }
+        public static void AddScriptingDefineSymbol(string symbol, UnityEditor.BuildTargetGroup targetGroup)
+        {
+
+            var scriptingDefineSymbolsForGroup = UnityEditor.PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup);
+            if (!scriptingDefineSymbolsForGroup.Contains(symbol))
+            {
+                scriptingDefineSymbolsForGroup += ";" + symbol;
+            }
+            UnityEditor.PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup, scriptingDefineSymbolsForGroup);
+        }
+
+        [System.Obsolete("Use AddAltTesterInScriptingDefineSymbolsGroup instead.")]
+        public static void AddAltTesterInScritpingDefineSymbolsGroup(UnityEditor.BuildTargetGroup targetGroup)
+        {
+            AddAltTesterInScriptingDefineSymbolsGroup(targetGroup);
+        }
+
+        public static bool CheckAltTesterIsDefineAsAScriptingSymbol(UnityEditor.BuildTargetGroup targetGroup)
+        {
+            var scriptingDefineSymbolsForGroup = UnityEditor.PlayerSettings.GetScriptingDefineSymbolsForGroup(targetGroup);
+            return scriptingDefineSymbolsForGroup.Contains(ALTTESTERDEFINE);
+        }
+
+        public static void CreateJsonFileForInputMappingOfAxis()
+        {
+            string gameDataProjectFilePath = "/Resources/AltTester/AltTesterInputAxisData.json";
+            var inputManager = UnityEditor.AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/InputManager.asset")[0];
+            var obj = new UnityEditor.SerializedObject(inputManager);
+
+            UnityEditor.SerializedProperty axisArray = obj.FindProperty("m_Axes");
+
+            if (axisArray.arraySize == 0)
+                logger.Info("No Axes");
+            var axisList = new List<AltAxis>();
+            for (int i = 0; i < axisArray.arraySize; ++i)
+            {
+                var axis = axisArray.GetArrayElementAtIndex(i);
+
+                var name = axis.FindPropertyRelative("m_Name").stringValue;
+                var inputType = (InputType)axis.FindPropertyRelative("type").intValue;
+                var negativeButton = axis.FindPropertyRelative("negativeButton").stringValue;
+                var positiveButton = axis.FindPropertyRelative("positiveButton").stringValue;
+                var altPositiveButton = axis.FindPropertyRelative("altPositiveButton").stringValue;
+                var altNegativeButton = axis.FindPropertyRelative("altNegativeButton").stringValue;
+                axisList.Add(new AltAxis(name, negativeButton, positiveButton, altPositiveButton, altNegativeButton));
+            }
+
+            string dataAsJson = Newtonsoft.Json.JsonConvert.SerializeObject(axisList);
+            string filePath = Application.dataPath + gameDataProjectFilePath;
+            if (!UnityEditor.AssetDatabase.IsValidFolder("Assets/Resources/AltTester"))
+            {
+                if (!UnityEditor.AssetDatabase.IsValidFolder("Assets/Resources"))
+                {
+                    UnityEditor.AssetDatabase.CreateFolder("Assets", "Resources");
+                }
+                UnityEditor.AssetDatabase.CreateFolder("Assets/Resources", "AltTester");
+            }
+            using (StreamWriter sw = new StreamWriter(filePath))
+            {
+                sw.Write(dataAsJson);
+            }
+            UnityEditor.AssetDatabase.Refresh();
+        }
+
+        public static void InsertAltInScene(string scene, AltInstrumentationSettings instrumentationSettings)
+        {
+            logger.Debug("Adding AltTesterPrefab into the [" + scene + "] scene.");
+            var altRunner = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(UnityEditor.AssetDatabase.GUIDToAssetPath(UnityEditor.AssetDatabase.FindAssets(PREFABNAME)[0]));
+
+            SceneWithAltRunner = EditorSceneManager.OpenScene(scene);
+            AltRunner = UnityEditor.PrefabUtility.InstantiatePrefab(altRunner);
+            var altRunnerComponent = ((GameObject)AltRunner).GetComponent<AltRunner>();
+            altRunnerComponent.InstrumentationSettings = instrumentationSettings;
+
+            EditorSceneManager.MarkSceneDirty(UnityEngine.SceneManagement.SceneManager.GetActiveScene());
+            EditorSceneManager.SaveOpenScenes();
+            logger.Info("AltTesterPrefab successfully modified into the [" + scene + "] scene.");
+        }
+
+        public static void InsertAltInTheActiveScene(AltInstrumentationSettings instrumentationSettings)
+        {
+            var activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene().path;
+            InsertAltInScene(activeScene, instrumentationSettings);
+        }
+
+        public static void InsertAltInTheFirstScene(AltInstrumentationSettings instrumentationSettings)
+        {
+            var altRunner = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(UnityEditor.AssetDatabase.GUIDToAssetPath(UnityEditor.AssetDatabase.FindAssets(PREFABNAME)[0]));
+
+            PreviousScenePath = UnityEngine.SceneManagement.SceneManager.GetActiveScene().path;
+            SceneWithAltRunner = EditorSceneManager.OpenScene(GetFirstSceneWhichWillBeBuilt());
+
+            AltRunner = UnityEditor.PrefabUtility.InstantiatePrefab(altRunner);
+            AltRunner altRunnerComponent = ((UnityEngine.GameObject)AltRunner).GetComponent<AltRunner>();
+            altRunnerComponent.InstrumentationSettings = instrumentationSettings;
+
+
+            EditorSceneManager.MarkSceneDirty(UnityEngine.SceneManagement.SceneManager.GetActiveScene());
+            EditorSceneManager.SaveOpenScenes();
+
+            try
+            {
+                EditorSceneManager.OpenScene(PreviousScenePath);
+            }
+            catch
+            {
+                logger.Info("No scene was loaded yet.");
+            }
+        }
+
+        public static string GetFirstSceneWhichWillBeBuilt()
+        {
+            foreach (var scene in AltTesterEditorWindow.EditorConfiguration.Scenes)
+            {
+                if (scene.ToBeBuilt)
+                {
+                    return scene.Path;
+                }
+            }
+
+            return "";
+        }
+
+#if UNITY_EDITOR_OSX
+
+
+        public static void BuildiOSFromUI(bool autoRun)
+        {
+            try
+            {
+                InitBuildSetup(UnityEditor.BuildTargetGroup.iOS);
+                logger.Debug("Starting IOS build..." + UnityEditor.PlayerSettings.productName + " : " + UnityEditor.PlayerSettings.bundleVersion);
+                UnityEditor.BuildPlayerOptions buildPlayerOptions = new UnityEditor.BuildPlayerOptions();
+                buildPlayerOptions.locationPathName = getOutputPath(UnityEditor.BuildTarget.iOS);
+                buildPlayerOptions.scenes = getScenesForBuild();
+
+                buildPlayerOptions.target = UnityEditor.BuildTarget.iOS;
+                buildGame(autoRun, buildPlayerOptions);
+
+            }
+            catch (System.Exception e)
+            {
+                logger.Error(e);
+            }
+            finally
+            {
+                Built = true;
+                resetBuildSetup(UnityEditor.BuildTargetGroup.iOS);
+            }
+
+        }
+#endif
+
+        private static string getOutputPath(UnityEditor.BuildTarget target)
+        {
+            var outputPath = AltTesterEditorWindow.EditorConfiguration.BuildLocationPath;
+
+            outputPath = string.IsNullOrEmpty(outputPath) ? "build" : outputPath;
+            outputPath = System.IO.Path.Combine(outputPath, UnityEditor.PlayerSettings.productName);
+
+            switch (target)
+            {
+                case UnityEditor.BuildTarget.Android:
+                    if (!outputPath.EndsWith(".apk"))
+                    {
+                        outputPath = outputPath + ".apk";
+                    }
+
+                    break;
+                case UnityEditor.BuildTarget.StandaloneOSX:
+                    if (!outputPath.EndsWith(".app"))
+                    {
+                        outputPath = outputPath + ".app";
+                    }
+                    break;
+                case UnityEditor.BuildTarget.StandaloneWindows:
+                case UnityEditor.BuildTarget.StandaloneWindows64:
+                    if (!outputPath.EndsWith(".exe"))
+                    {
+                        outputPath = outputPath + ".exe";
+                    }
+                    break;
+                case UnityEditor.BuildTarget.StandaloneLinux64:
+                    if (!outputPath.EndsWith(".x86_64"))
+                    {
+                        outputPath = outputPath + ".x86_64";
+                    }
+                    break;
+
+                case UnityEditor.BuildTarget.iOS:
+                default:
+                    break;
+
+            }
+
+            return outputPath;
+        }
+
+        private static void resetBuildSetup(UnityEditor.BuildTargetGroup buildTargetGroup)
+        {
+            if (AltTesterEditorWindow.EditorConfiguration.appendToName)
+            {
+                UnityEditor.PlayerSettings.productName = UnityEditor.PlayerSettings.productName.Remove(UnityEditor.PlayerSettings.productName.Length - 5);
+                string bundleIdentifier = UnityEditor.PlayerSettings.GetApplicationIdentifier(buildTargetGroup).Remove(UnityEditor.PlayerSettings.GetApplicationIdentifier(buildTargetGroup).Length - 5);
+                UnityEditor.PlayerSettings.SetApplicationIdentifier(buildTargetGroup, bundleIdentifier);
+            }
+
+            RemoveAltTesterFromScriptingDefineSymbols(buildTargetGroup);
+        }
+
+        private static void buildGame(bool autoRun, UnityEditor.BuildPlayerOptions buildPlayerOptions)
+        {
+            UnityEditor.PlayerSettings.SetStackTraceLogType(LogType.Log, StackTraceLogType.None);
+            UnityEditor.PlayerSettings.SetStackTraceLogType(LogType.Warning, StackTraceLogType.None);
+            UnityEditor.PlayerSettings.SetStackTraceLogType(LogType.Assert, StackTraceLogType.None);
+
+            if (autoRun)
+            {
+                buildPlayerOptions.options = UnityEditor.BuildOptions.Development | UnityEditor.BuildOptions.AutoRunPlayer | UnityEditor.BuildOptions.IncludeTestAssemblies;
+            }
+            else
+            {
+                buildPlayerOptions.options = UnityEditor.BuildOptions.Development | UnityEditor.BuildOptions.ShowBuiltPlayer | UnityEditor.BuildOptions.IncludeTestAssemblies;
+            }
+            var results = UnityEditor.BuildPipeline.BuildPlayer(buildPlayerOptions);
+
+
+#if UNITY_2017
+            if (results.Equals(""))
+            {
+                logger.Info("Build path: " + buildPlayerOptions.locationPathName);
+                logger.Info("Build " + UnityEditor.PlayerSettings.productName + ":" + UnityEditor.PlayerSettings.bundleVersion + " Succeeded");
+            }
+            else
+            {
+                logger.Error("Build Error!");
+            }
+
+#else
+            if (results.summary.totalErrors == 0 || results.summary.result == UnityEditor.Build.Reporting.BuildResult.Succeeded)
+            {
+                logger.Info("Build path: " + buildPlayerOptions.locationPathName);
+                logger.Info("Build " + UnityEditor.PlayerSettings.productName + ":" + UnityEditor.PlayerSettings.bundleVersion + " Succeeded");
+            }
+            else
+            {
+                logger.Error("Build Error! " + results.steps + "\n Result: " + results.summary.result +
+                           "\n Stripping info: " + results.strippingInfo);
+            }
+#endif
+
+        }
+
+        private static string[] getScenesForBuild()
+        {
+            if (AltTesterEditorWindow.EditorConfiguration.Scenes.Count == 0)
+            {
+                AltTesterEditorWindow.AddAllScenes();
+                AltTesterEditorWindow.SelectAllScenes();
+            }
+            var sceneList = new List<string>();
+            foreach (var scene in AltTesterEditorWindow.EditorConfiguration.Scenes)
+            {
+                if (scene.ToBeBuilt)
+                {
+                    sceneList.Add(scene.Path);
+                }
+            }
+
+            InsertAltInTheFirstScene(AltTesterEditorWindow.EditorConfiguration.GetInstrumentationSettings());
+
+            return sceneList.ToArray();
+        }
+    }
 }
\ No newline at end of file
diff --git a/Assets/AltTester/Editor/AltDesktopPage.cs b/Assets/AltTester/Editor/AltDesktopPage.cs
index 13df85edc..8e45b1b45 100644
--- a/Assets/AltTester/Editor/AltDesktopPage.cs
+++ b/Assets/AltTester/Editor/AltDesktopPage.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     public class AltDesktopPage : UnityEditor.EditorWindow
     {
diff --git a/Assets/AltTester/Editor/AltEditorConfiguration.cs b/Assets/AltTester/Editor/AltEditorConfiguration.cs
index 7f4789144..fe21998f5 100644
--- a/Assets/AltTester/Editor/AltEditorConfiguration.cs
+++ b/Assets/AltTester/Editor/AltEditorConfiguration.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Altom.AltTester;
+using AltTester;
 using UnityEngine;
 
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     public class AltEditorConfiguration : ScriptableObject
     {
@@ -24,8 +24,10 @@ public class AltEditorConfiguration : ScriptableObject
         public bool createXMLReport = false;
         public string xMLFilePath = "";
 
-        public int AltTesterPort = 13000;
+        public int ProxyPort = 13000;
+        public string ProxyHost = "127.0.0.1";
 
+        public string GameName = "__default__";
 
         public AltInstrumentationSettings GetInstrumentationSettings()
         {
@@ -33,7 +35,9 @@ public AltInstrumentationSettings GetInstrumentationSettings()
             {
                 ShowPopUp = ShowPopUp,
                 InputVisualizer = InputVisualizer,
-                AltTesterPort = AltTesterPort,
+                ProxyPort = ProxyPort,
+                ProxyHost = ProxyHost,
+                GameName = GameName
             };
         }
         public bool KeepAUTSymbolDefined = false;
diff --git a/Assets/AltTester/Editor/AltMyScenes.cs b/Assets/AltTester/Editor/AltMyScenes.cs
index 3987f9a3b..982208bfc 100644
--- a/Assets/AltTester/Editor/AltMyScenes.cs
+++ b/Assets/AltTester/Editor/AltMyScenes.cs
@@ -1,4 +1,4 @@
-﻿namespace Altom.AltTesterEditor
+﻿namespace AltTesterEditor
 {
     [System.Serializable]
     public class AltMyScenes
diff --git a/Assets/AltTester/Editor/AltMyTest.cs b/Assets/AltTester/Editor/AltMyTest.cs
index f4db208ec..534360ed3 100644
--- a/Assets/AltTester/Editor/AltMyTest.cs
+++ b/Assets/AltTester/Editor/AltMyTest.cs
@@ -2,7 +2,7 @@
 using System;
 using UnityEngine;
 
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     [System.Serializable]
     public class AltMyTest
diff --git a/Assets/AltTester/Editor/AltPlatform.cs b/Assets/AltTester/Editor/AltPlatform.cs
index 320c9d4b2..f7aaae090 100644
--- a/Assets/AltTester/Editor/AltPlatform.cs
+++ b/Assets/AltTester/Editor/AltPlatform.cs
@@ -1,4 +1,4 @@
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     public enum AltPlatform
     {
@@ -8,6 +8,6 @@ public enum AltPlatform
 #endif
         Editor,
         Standalone,
-        // WebGL
+        WebGL
     }
 }
diff --git a/Assets/AltTester/Editor/AltTestRunListener.cs b/Assets/AltTester/Editor/AltTestRunListener.cs
index d91b298ce..c04165d76 100644
--- a/Assets/AltTester/Editor/AltTestRunListener.cs
+++ b/Assets/AltTester/Editor/AltTestRunListener.cs
@@ -1,6 +1,6 @@
-﻿using Altom.AltTesterEditor.Logging;
+﻿using AltTesterEditor.Logging;
 
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     public class AltTestRunListener : NUnit.Framework.Interfaces.ITestListener
     {
diff --git a/Assets/AltTester/Editor/AltTestRunner.cs b/Assets/AltTester/Editor/AltTestRunner.cs
index aa774e8be..03df073db 100644
--- a/Assets/AltTester/Editor/AltTestRunner.cs
+++ b/Assets/AltTester/Editor/AltTestRunner.cs
@@ -3,14 +3,14 @@
 using System.Linq;
 using System.Reflection;
 using System.Xml;
-using Altom.AltDriver;
-using Altom.AltTesterEditor.Logging;
+using AltTester.AltDriver;
+using AltTesterEditor.Logging;
 using Newtonsoft.Json;
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal.Filters;
 using Unity.EditorCoroutines.Editor;
 
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     public delegate void TestRunDelegate(string name);
 
diff --git a/Assets/AltTester/Editor/AltTesterEditorSettings.asset b/Assets/AltTester/Editor/AltTesterEditorSettings.asset
index c03820c9b..3e405597f 100644
--- a/Assets/AltTester/Editor/AltTesterEditorSettings.asset
+++ b/Assets/AltTester/Editor/AltTesterEditorSettings.asset
@@ -18,852 +18,950 @@ MonoBehaviour:
   XcrunPath: /usr/bin/xcrun
   MyTests:
   - _selected: 0
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestAssembly
     _parentName: 
-    _testCaseCount: 285
+    _testCaseCount: 296
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 226
-  - _selected: 1
+    _testSelectedCount: 294
+  - _selected: 0
     _testName: Altom
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestSuite
-    _parentName: D:/Altom/altunitytester/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
-    _testCaseCount: 226
+    _parentName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+    _testCaseCount: 2
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0
+    path: 
+    _testSelectedCount: 0
+  - _selected: 0
+    _testName: Altom.AltInstrumentation
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 0
+    _isSuite: 1
+    _type: NUnit.Framework.Internal.TestSuite
+    _parentName: Altom
+    _testCaseCount: 2
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0
+    path: 
+    _testSelectedCount: 0
+  - _selected: 0
+    _testName: Altom.AltInstrumentation.Tests
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 0
+    _isSuite: 1
+    _type: NUnit.Framework.Internal.TestSuite
+    _parentName: Altom.AltInstrumentation
+    _testCaseCount: 2
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0
+    path: 
+    _testSelectedCount: 0
+  - _selected: 0
+    _testName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 1
+    _type: NUnit.Framework.Internal.TestFixture
+    _parentName: Altom.AltInstrumentation.Tests
+    _testCaseCount: 2
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0
+    path: 
+    _testSelectedCount: 0
+  - _selected: 0
+    _testName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests.TestConnectWithNoServer
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests
+    _testCaseCount: 1
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 4.0991273
+    path: Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
+    _testSelectedCount: 0
+  - _selected: 0
+    _testName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests.TestConnectWithServer
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests
+    _testCaseCount: 1
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 2.1939258
+    path: Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 0
+    _isSuite: 1
+    _type: NUnit.Framework.Internal.TestSuite
+    _parentName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+    _testCaseCount: 232
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 226
+    _testSelectedCount: 232
   - _selected: 1
-    _testName: Altom.AltDriver
+    _testName: AltTester.AltDriver
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestSuite
-    _parentName: Altom
-    _testCaseCount: 224
+    _parentName: AltTester
+    _testCaseCount: 232
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 224
+    _testSelectedCount: 232
   - _selected: 1
-    _testName: Altom.AltDriver.Tests
+    _testName: AltTester.AltDriver.Tests
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestSuite
-    _parentName: Altom.AltDriver
-    _testCaseCount: 224
+    _parentName: AltTester.AltDriver
+    _testCaseCount: 232
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 224
+    _testSelectedCount: 232
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.AltCommandsTests
+    _testName: AltTester.AltDriver.Tests.AltCommandsTests
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
+    _parentName: AltTester.AltDriver.Tests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
     _testSelectedCount: 1
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.AltCommandsTests.TestSetServerLogging
+    _testName: AltTester.AltDriver.Tests.AltCommandsTests.TestSetServerLogging
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.AltCommandsTests
+    _parentName: AltTester.AltDriver.Tests.AltCommandsTests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.4530026
+    _testDuration: 0.7383971
     path: Assets/AltTester/Examples/Test/Editor/Driver/Commands/AltCommandsTests.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
-    _testCaseCount: 193
+    _parentName: AltTester.AltDriver.Tests
+    _testCaseCount: 200
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 193
+    _testSelectedCount: 200
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestAcceleration
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 1.4452487
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestAcceleration
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestAccelerationAndWait
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.2120341
+    _testDuration: 1.3895211
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestAccelerationAndWait
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallGameObjectMethod
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.2580505
+    _testDuration: 0.167014
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallGameObjectMethod
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodAssemblyNotFound
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1349496
+    _testDuration: 0.2032052
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodAssmeblyNotFound
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInsideAListOfSubObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.138462
+    _testDuration: 0.2442013
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInsideAListOfSubObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInsideASubObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1375653
+    _testDuration: 0.2006765
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInsideASubObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInsideSubObjectOfGameObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1312679
+    _testDuration: 0.1559787
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInsideSubObjectOfGameObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInvalidMethodArgumentTypes
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.131557
+    _testDuration: 0.2082471
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInvalidMethodArgumentTypes
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInvalidParameterType
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1378524
+    _testDuration: 0.2445803
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodInvalidParameterType
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodSetFontSizeWithParameters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.127721
+    _testDuration: 0.2027678
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithAssembly
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithAssembly
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2800538
+    _testDuration: 0.3830305
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithIncorrectNumberOfParameters
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithIncorrectNumberOfParameters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1559215
+    _testDuration: 0.1824876
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithIncorrectNumberOfParameters2
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithIncorrectNumberOfParameters2
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1286987
+    _testDuration: 0.1592837
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithManyParameters
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithManyParameters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1394147
+    _testDuration: 0.1811322
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithMultipleDefinitions
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithMultipleDefinitions
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1741418
+    _testDuration: 0.2436339
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithNoParameters
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithNoParameters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1390601
+    _testDuration: 0.2218954
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithOptionalParemeters
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithOptionalParemeters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1383714
+    _testDuration: 0.2301636
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithOptionalParemetersString
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithOptionalParemetersString
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1656564
+    _testDuration: 0.2245803
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithOptionalParemetersString2
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithOptionalParemetersString2
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1442598
+    _testDuration: 0.2118277
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithParameters
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallMethodWithParameters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1365057
+    _testDuration: 0.2029608
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallPrivateMethod
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallPrivateMethod
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1779606
+    _testDuration: 0.2685446
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallStaticMethod
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallStaticMethod
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1268555
+    _testDuration: 0.2135241
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCallStaticMethodInsideASubObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCallStaticMethodInsideASubObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.117824
+    _testDuration: 0.18215
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCameraNotFoundException
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCameraNotFoundException
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1186929
+    _testDuration: 0.1322225
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClick
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClick
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2226124
+    _testDuration: 0.3146301
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClick_MouseDownUp
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClick_MouseDownUp
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.327474
+    _testDuration: 0.4964212
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClick_MultipleClicks
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClick_MultipleClicks
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2592283
+    _testDuration: 0.4269538
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickButtonInWolrdSpaceCanvas
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickButtonInWolrdSpaceCanvas
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3234547
+    _testDuration: 0.7377348
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2374753
+    _testDuration: 0.2275791
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_ColliderNoParent
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_ColliderNoParent
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1637055
+    _testDuration: 0.1952483
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_ColliderParentCollider
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_ColliderParentCollider
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3143933
+    _testDuration: 0.3984782
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_MouseDownUp
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_MouseDownUp
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1711496
+    _testDuration: 0.4397693
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_MultipleClicks
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinates_MultipleClicks
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2881632
+    _testDuration: 0.5222006
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinatesCheckPressRaycastObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickCoordinatesCheckPressRaycastObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1647184
+    _testDuration: 0.2772274
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickElement
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickElement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1917913
+    _testDuration: 0.2586105
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickOnChangingSceneButton
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickOnChangingSceneButton
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2968298
+    _testDuration: 0.5088397
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickWithMouse0Capsule
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickWithMouse0Capsule
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.8898415
+    _testDuration: 1.0129293
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickWithMouse1Capsule
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickWithMouse1Capsule
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.8916683
+    _testDuration: 0.9863463
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestClickWithMouse2Capsule
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestClickWithMouse2Capsule
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.9621857
+    _testDuration: 0.9478478
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestCustomTap
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestCustomTap
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.4856107
+    _testDuration: 1.5547415
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestDeleteKey
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestDeleteKey
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1793824
+    _testDuration: 0.2883621
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestDifferentCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestDifferentCamera
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2398867
+    _testDuration: 0.3570042
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestDifferentObjectSelectedClickingOnScreenshot
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestDifferentObjectSelectedClickingOnScreenshot
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.4696358
+    _testDuration: 0.4686979
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestDoubleTap
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestDoubleTap
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.7674322
+    _testDuration: 0.843394
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindChild
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindChild
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1272821
+    _testDuration: 0.1579703
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElement
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1389693
+    _testDuration: 0.2161388
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementAtCoordinates_3dElement
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementAtCoordinates_3dElement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1654703
+    _testDuration: 0.211149
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementAtCoordinates_NoElement
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementAtCoordinates_NoElement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.130216
+    _testDuration: 0.1668087
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElements
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElements
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.138738
+    _testDuration: 0.1568941
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementsWhereNameContains
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementsWhereNameContains
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1347894
+    _testDuration: 0.1453154
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementThatContainsText
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementThatContainsText
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1342519
+    _testDuration: 0.1467555
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementWhereNameContains
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementWhereNameContains
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1308777
+    _testDuration: 0.1420051
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementWithText
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementWithText
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1336291
+    _testDuration: 0.172553
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindElementWithTextByPath
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindElementWithTextByPath
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1327144
+    _testDuration: 0.1560241
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.ParameterizedMethodSuite
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 4
     _foldOut: 0
     _testResultMessage: 
@@ -872,96 +970,96 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 4
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("//*[contains(@name,Cub)]","Cube")
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("//*[contains(@name,Cub)]","Cube")
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1233975
+    _testDuration: 0.135433
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("//RotateMainCameraButton/../*[contains(@name,Seconda)]/Text","Text")
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("//RotateMainCameraButton/../*[contains(@name,Seconda)]/Text","Text")
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1191646
+    _testDuration: 0.1507121
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("//*[@component=BoxCollider]","Cube")
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("//*[@component=BoxCollider]","Cube")
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.138484
+    _testDuration: 0.192131
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("/Capsule/../Plane","Plane")
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects("/Capsule/../Plane","Plane")
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindingDifferentObjects
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1327786
+    _testDuration: 0.1580311
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNonExistentObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNonExistentObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1565205
+    _testDuration: 0.1798277
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNonExistentObjectByName
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNonExistentObjectByName
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1288384
+    _testDuration: 0.1807474
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.ParameterizedMethodSuite
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 9
     _foldOut: 0
     _testResultMessage: 
@@ -970,2070 +1068,2172 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 9
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[0]","CapsuleInfo",True)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[0]","CapsuleInfo",True)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1387193
+    _testDuration: 0.1443866
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[1]","UIButton",True)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[1]","UIButton",True)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1338476
+    _testDuration: 0.1744198
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[-1]","TapClickEventsButtonCollider",True)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[-1]","TapClickEventsButtonCollider",True)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1203223
+    _testDuration: 0.2163173
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[-2]","NextScene",True)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[-2]","NextScene",True)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1429678
+    _testDuration: 0.2076456
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[@layer=UI][5]","UnityUIInputField",True)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[@layer=UI][5]","UnityUIInputField",True)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1310937
+    _testDuration: 0.1739101
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[1]/Text","Text",True)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("/Canvas[1]/Text","Text",True)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1554057
+    _testDuration: 0.1740783
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("//Dialog[0]","Title",False)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("//Dialog[0]","Title",False)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1289536
+    _testDuration: 0.2243254
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("//Dialog[1]","Message",False)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("//Dialog[1]","Message",False)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1334024
+    _testDuration: 0.1854498
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("//Dialog[-1]","CloseButton",False)
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild("//Dialog[-1]","CloseButton",False)
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindNthChild
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1315429
+    _testDuration: 0.1421783
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByAltId
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0.2124985
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByCamera
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0.3493438
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByComponent
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 1.1327594
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByComponent2
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 0.1884488
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByAltId
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByComponentWithNamespace
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2046015
+    _testDuration: 1.1236814
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByLayer
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2479148
+    _testDuration: 0.1569681
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByComponent
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.0713366
+    _testDuration: 0.1839734
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByComponent2
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByUnityComponent
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1297614
+    _testDuration: 0.1837638
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByComponentWithNamespace
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjects
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.0816857
+    _testDuration: 0.1470401
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByLayer
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByCamera
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1347401
+    _testDuration: 0.2909652
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByComponent
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1389348
+    _testDuration: 0.1869389
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectByUnityComponent
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByContainName
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1486007
+    _testDuration: 0.2072699
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjects
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByLayer
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1446397
+    _testDuration: 0.2186579
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2572624
+    _testDuration: 0.1496785
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByComponent
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectScene1
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1423775
+    _testDuration: 0.1921742
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByContainName
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectScene6
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1423141
+    _testDuration: 1.5595933
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByLayer
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsWithCameraId
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1370383
+    _testDuration: 0.4062935
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsByTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsWithTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1303954
+    _testDuration: 0.3454415
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectScene1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectWhichContains
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.121712
+    _testDuration: 0.2118362
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectScene6
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectWithMultipleSelector
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.3605685
+    _testDuration: 0.2894314
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsWithCameraId
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindObjectWithTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3094528
+    _testDuration: 0.4263172
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectsWithTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindParentUsingPath
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2549224
+    _testDuration: 0.2135949
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectWhichContains
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestFindWithFindObjectWhichContainsNotExistingObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1332475
+    _testDuration: 0.1912315
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectWithMultipleSelector
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestForSetText
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1750481
+    _testDuration: 0.32725
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindObjectWithTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGet3DObjectFromScreenshot
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2602454
+    _testDuration: 0.3395069
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindParentUsingPath
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllActiveCameras
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.120892
+    _testDuration: 0.1762476
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestFindWithFindObjectWhichContainsNotExistingObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllCameras
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1267872
+    _testDuration: 0.1936267
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestForSetText
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllClassFields
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1856748
+    _testDuration: 0.2140958
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGet3DObjectFromScreenshot
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllClassProperties
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2885498
+    _testDuration: 0.2127262
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllActiveCameras
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllComponents
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1355131
+    _testDuration: 0.1595852
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllCameras
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllElementsLight
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1340762
+    _testDuration: 0.1994774
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllClassFields
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllFields
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1797999
+    _testDuration: 0.2510995
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllClassProperties
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllInheritedFields
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1699098
+    _testDuration: 0.2506348
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllComponents
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllInheritedProperties
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1420352
+    _testDuration: 0.2657305
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllElementsLight
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllMethods
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1442995
+    _testDuration: 0.2682573
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllFields
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllMethodsFromClass
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1510217
+    _testDuration: 0.2534571
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllInheritedFields
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllMethodsFromInherited
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1450978
+    _testDuration: 0.2573786
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllInheritedProperties
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllProperties
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1658802
+    _testDuration: 0.2303305
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllMethods
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllScenes
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.159479
+    _testDuration: 0.1671898
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllMethodsFromClass
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAllScenesAndObjectDisableEnableOption
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1808452
+    _testDuration: 0.2679564
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllMethodsFromInherited
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetAltObjectWithCanvasParentButOnlyTransform
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1505382
+    _testDuration: 0.2114356
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllProperties
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetApplicationScreenSize
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1661084
+    _testDuration: 0.2303006
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllScenes
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetChineseLetters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1242149
+    _testDuration: 0.1641594
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentProperty
+    _testAssembly: Assembly-CSharp-Editor
+    _status: -1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: "  Expected: 13010\r\n  But was:  13000\r\n"
+    _testStackTrace: 'at AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentProperty
+      () [0x0005c] in D:\github\AltTester-Unity-SDK\Assets\AltTester\Examples\Test\Editor\Driver\Testforscene1TestSample.cs:233
+
+'
+    _testDuration: 0.2726602
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAllScenesAndObjectDisableEnableOption
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyArray
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1438788
+    _testDuration: 0.167866
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetAltObjectWithCanvasParentButOnlyTransform
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyComplexClass
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1577167
+    _testDuration: 0.2029594
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetChineseLetters
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyComplexClass2
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1475923
+    _testDuration: 0.2310918
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentProperty
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyInvalidDeserialization
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1479463
+    _testDuration: 0.2070837
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyArray
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyNotFoundWithAssembly
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1504589
+    _testDuration: 1.1369258
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyComplexClass
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyNullValue
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1447857
+    _testDuration: 0.1633455
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyComplexClass2
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyPrivate
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1496937
+    _testDuration: 0.2158116
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyInvalidDeserialization
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyStatic
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1478803
+    _testDuration: 0.2170747
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyNotFoundWithAssembly
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyStaticPublic
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.0870781
+    _testDuration: 0.1663038
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyNullValue
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyUnityEngine
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1440784
+    _testDuration: 0.2240799
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyPrivate
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetCurrentScene
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1341824
+    _testDuration: 0.1614755
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyStatic
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetNonExistingComponentProperty
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1367316
+    _testDuration: 1.1382747
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyStaticPublic
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetObjectWithNumberAsName
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1476787
+    _testDuration: 0.2379848
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetComponentPropertyUnityEngine
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetScreenshot
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1509198
+    _testDuration: 0.2478734
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetCurrentScene
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetScreensizeScreenshot
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1436104
+    _testDuration: 0.5790013
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetNonExistingComponentProperty
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetStaticProperty
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.0846649
+    _testDuration: 0.1917227
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetObjectWithNumberAsName
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetStaticPropertyInstanceNull
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1527623
+    _testDuration: 0.1766035
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetScreenshot
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetTextCallMethodWithNoParameters
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2574137
+    _testDuration: 0.164436
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetScreensizeScreenshot
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetUIObjectFromScreenshot
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.7392816
+    _testDuration: 0.4789888
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetStaticProperty
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestGetVersion
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.128284
+    _testDuration: 0.1383951
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetStaticPropertyInstanceNull
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestHoldButton
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1362581
+    _testDuration: 1.2846385
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetUIObjectFromScreenshot
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestInactiveObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2860071
+    _testDuration: 0.147611
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestGetVersion
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestInvalidPaths
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1298113
+    _testDuration: 0.2030734
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestHoldButton
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestKeyDownAndKeyUpMouse0
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.203736
+    _testDuration: 0.7400173
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestInactiveObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestKeyPressNumberOfReads
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1277667
+    _testDuration: 0.3099898
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestInvalidPaths
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestKeysDown
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1755261
+    _testDuration: 0.2528433
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestKeyDownAndKeyUpMouse0
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestLoadAdditiveScenes
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.809933
+    _testDuration: 0.3937505
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestKeyPressNumberOfReads
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestLoadNonExistentScene
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2736485
+    _testDuration: 0.1823561
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestKeysDown
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestNonEnglishText
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1662205
+    _testDuration: 0.2448039
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestLoadAdditiveScenes
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestObjectFromScreenshot
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.349013
+    _testDuration: 0.3232305
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestLoadNonExistentScene
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestOpenDialogWithBeginEndTouch
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2019364
+    _testDuration: 0.8353455
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestNonEnglishText
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestPointerEnter_PointerExit
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1396883
+    _testDuration: 4.1838364
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestObjectFromScreenshot
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestPointerPressSet
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2708933
+    _testDuration: 0.473365
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestOpenDialogWithBeginEndTouch
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestPressKeys
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1956704
+    _testDuration: 0.3786607
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestPointerEnter_PointerExit
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestPressKeyWaitTheDuration
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 4.0125052
+    _testDuration: 1.4174061
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestPointerPressSet
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestPressNextSceneButtton
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3618468
+    _testDuration: 0.4146067
+    path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestResetInput
+    _testAssembly: Assembly-CSharp-Editor
+    _status: -1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
+    _testCaseCount: 1
+    _foldOut: 1
+    _testResultMessage: 'AltTester.AltDriver.ComponentNotFoundException : Component
+      not found'
+    _testStackTrace: "  at AltTester.AltDriver.Commands.DriverCommunicationWebSocket.handleErrors
+      (AltTester.AltDriver.Commands.CommandError error) [0x00354] in D:\\github\\AltTester-Unity-SDK\\Assets\\AltTester\\AltDriver\\Commands\\DriverCommunicationWebSocket.cs:235
+      \r\n  at AltTester.AltDriver.Commands.DriverCommunicationWebSocket.Recvall[T]
+      (AltTester.AltDriver.Commands.CommandParams param) [0x0016b] in D:\\github\\AltTester-Unity-SDK\\Assets\\AltTester\\AltDriver\\Commands\\DriverCommunicationWebSocket.cs:126
+      \r\n  at AltTester.AltDriver.Commands.AltGetComponentProperty`1[T].Execute
+      () [0x00013] in D:\\github\\AltTester-Unity-SDK\\Assets\\AltTester\\AltDriver\\Commands\\ObjectCommands\\AltGetComponentProperty.cs:13
+      \r\n  at AltTester.AltDriver.AltObject.GetComponentProperty[T] (System.String
+      componentName, System.String propertyName, System.String assemblyName, System.Int32
+      maxDepth) [0x00001] in D:\\github\\AltTester-Unity-SDK\\Assets\\AltTester\\AltDriver\\Common\\AltObject.cs:101
+      \r\n  at AltTester.AltDriver.Tests.TestForScene1TestSample.TestResetInput ()
+      [0x00014] in D:\\github\\AltTester-Unity-SDK\\Assets\\AltTester\\Examples\\Test\\Editor\\Driver\\Testforscene1TestSample.cs:2163
+      \r\n  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)\r\n 
+      at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags
+      invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo
+      culture) [0x0006a] in <d6232873609549b8a045fa15811a5bd3>:0 "
+    _testDuration: 0.2409193
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestPressKeys
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestScrollViewSwipe
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2685247
+    _testDuration: 2.4232324
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestPressNextSceneButtton
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetCommandTimeout
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3049341
+    _testDuration: 1.1921334
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestScrollViewSwipe
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetComponentProperty
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.3841337
+    _testDuration: 0.1981458
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetCommandTimeout
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetComponentPropertyComplexClass
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1282619
+    _testDuration: 0.196296
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetComponentProperty
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetComponentPropertyComplexClass2
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1540366
+    _testDuration: 0.1987332
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetComponentPropertyComplexClass
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetComponentPropertyComplexClass3
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1514284
+    _testDuration: 0.2104077
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetComponentPropertyComplexClass2
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetKeyFloat
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1584164
+    _testDuration: 0.1841693
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetComponentPropertyComplexClass3
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetKeyInt
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1585695
+    _testDuration: 0.1864254
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetKeyFloat
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetKeyString
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1469141
+    _testDuration: 0.1853135
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetKeyInt
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetNonExistingComponentProperty
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1579115
+    _testDuration: 0.1867204
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetKeyString
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetStaticProperty
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1495101
+    _testDuration: 0.1855741
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetNonExistingComponentProperty
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetStaticProperty2
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1693288
+    _testDuration: 0.1658694
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetStructureProperty
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetStructureProperty
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2150485
+    _testDuration: 0.2407756
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetStructureProperty2
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetStructureProperty2
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1606584
+    _testDuration: 0.2708784
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetStructureProperty3
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetStructureProperty3
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1562825
+    _testDuration: 0.2016654
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetTextForTextMeshInputField
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetTextForTextMeshInputField
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2077166
+    _testDuration: 0.3745388
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetTextForUnityUIInputField
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetTextForUnityUIInputField
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2021904
+    _testDuration: 0.3795439
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSetTimeScale
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSetTimeScale
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1502879
+    _testDuration: 1.2085949
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestStringIsMarkedAsPrimitive
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestStringIsMarkedAsPrimitive
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1664155
+    _testDuration: 0.2509998
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSwipeClickWhenMovedButRemainsOnTheSameObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSwipeClickWhenMovedButRemainsOnTheSameObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.6946956
+    _testDuration: 1.7698371
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestSwipeWithDuration0
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestSwipeWithDuration0
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.6844549
+    _testDuration: 0.7639023
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestTap
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestTap
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2178235
+    _testDuration: 0.2748321
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestTap_MultipleTaps
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestTap_MultipleTaps
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2846627
+    _testDuration: 0.401958
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestTouchAreUpdatedWhenMoved
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestTouchAreUpdatedWhenMoved
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3777217
+    _testDuration: 0.4197217
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestUnloadOnlyScene
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestUnloadOnlyScene
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1335761
+    _testDuration: 0.1961424
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestUnloadScene
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestUnloadScene
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2034848
+    _testDuration: 0.350731
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForCurrentSceneToBe
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForCurrentSceneToBe
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1532544
+    _testDuration: 0.2620751
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForCurrentSceneToBeANonExistingScene
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForCurrentSceneToBeANonExistingScene
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1373187
+    _testDuration: 1.1900939
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithText
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithText
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1804247
+    _testDuration: 0.2311277
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithTextByCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithTextByCamera
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1672232
+    _testDuration: 0.2994223
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithTextWithCameraId
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithTextWithCameraId
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2055423
+    _testDuration: 0.3071619
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithTextWithTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForElementWithTextWithTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1825657
+    _testDuration: 0.2951138
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForExistingDisabledElement
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForExistingDisabledElement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1250474
+    _testDuration: 0.2107991
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForExistingElement
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForExistingElement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1254254
+    _testDuration: 0.1905823
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForExistingElementWhereNameContains
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForExistingElementWhereNameContains
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1438976
+    _testDuration: 0.2138837
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForNonExistingElementWhereNameContains
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForNonExistingElementWhereNameContains
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.138052
+    _testDuration: 1.2056504
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForNonExistingObject
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForNonExistingObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1183127
+    _testDuration: 1.1579569
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectByCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectByCamera
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2467698
+    _testDuration: 0.3763349
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectNotBePresentByCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectNotBePresentByCamera
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 5.3806565
+    _testDuration: 5.7181383
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectNotBePresentWithCameraId
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectNotBePresentWithCameraId
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 5.3986763
+    _testDuration: 5.5332587
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectNotBePresentWithTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectNotBePresentWithTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 5.3958429
+    _testDuration: 5.5565086
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectToNotExist
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectToNotExist
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 5.4165948
+    _testDuration: 5.5272292
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectToNotExistFail
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectToNotExistFail
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1584111
+    _testDuration: 1.2413402
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContains
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContains
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1297507
+    _testDuration: 0.2001385
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContainsByCamera
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContainsByCamera
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1233635
+    _testDuration: 0.1757724
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContainsWithCameraId
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContainsWithCameraId
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1636121
+    _testDuration: 0.196408
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContainsWithTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWhichContainsWithTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1416799
+    _testDuration: 0.1842239
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWithCameraId
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWithCameraId
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3076693
+    _testDuration: 0.4913937
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWithTag
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWithTag
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2698758
+    _testDuration: 0.3163024
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWithTextWrongText
+    _testName: AltTester.AltDriver.Tests.TestForScene1TestSample.TestWaitForObjectWithTextWrongText
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene1TestSample
+    _parentName: AltTester.AltDriver.Tests.TestForScene1TestSample
     _testCaseCount: 1
     _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1397167
+    _testDuration: 1.1930773
     path: Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
+    _parentName: AltTester.AltDriver.Tests
     _testCaseCount: 12
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
     _testSelectedCount: 12
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestClosePanel
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestClosePanel
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.316546
+    _testDuration: 0.3994553
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestCreateTouchTwice
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestCreateTouchTwice
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.239745
+    _testDuration: 0.4019257
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestGetAllElements
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestGetAllElements
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1495465
+    _testDuration: 0.1894416
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestGetAllEnabledElements
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestGetAllEnabledElements
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 2.0759964
+    _testDuration: 2.1276595
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestGetAllScenesAndElements
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestGetAllScenesAndElements
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1349765
+    _testDuration: 0.1757191
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestGetParent
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestGetParent
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1490712
+    _testDuration: 0.1597768
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestMovePanel
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestMovePanel
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 2.1700453
+    _testDuration: 2.1772998
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestNewTouchCommands
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestNewTouchCommands
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.1895192
+    _testDuration: 0.2453368
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestPointerDownFromObject
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestPointerDownFromObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.1765435
+    _testDuration: 1.2859463
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestPointerUpFromObject
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestPointerUpFromObject
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.2043484
+    _testDuration: 1.2672511
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestResizePanel
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestResizePanel
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 2.1583161
+    _testDuration: 2.2249382
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene2DraggablePanel.TestResizePanelWithMultipointSwipe
+    _testName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel.TestResizePanelWithMultipointSwipe
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene2DraggablePanel
+    _parentName: AltTester.AltDriver.Tests.TestForScene2DraggablePanel
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 4.1801768
+    _testDuration: 4.252447
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene3DragAndDrop
+    _testName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
+    _parentName: AltTester.AltDriver.Tests
     _testCaseCount: 5
     _foldOut: 0
     _testResultMessage: 
@@ -3042,82 +3242,82 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 5
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene3DragAndDrop.MultipleDragAndDrop
+    _testName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop.MultipleDragAndDrop
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene3DragAndDrop
+    _parentName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 4.7465704
+    _testDuration: 2.8498749
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene3DragAndDrop.MultipleDragAndDropWait
+    _testName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop.MultipleDragAndDropWait
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene3DragAndDrop
+    _parentName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 4.7186572
+    _testDuration: 3.5660003
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene3DragAndDrop.MultipleDragAndDropWaitWithMultipointSwipe
+    _testName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop.MultipleDragAndDropWaitWithMultipointSwipe
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene3DragAndDrop
+    _parentName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 5.6387227
+    _testDuration: 2.61279
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene3DragAndDrop.TestDragAndDrop
+    _testName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop.TestDragAndDrop
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene3DragAndDrop
+    _parentName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2642865
+    _testDuration: 0.3197173
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene3DragAndDrop.TestPointerEnterAndExit
+    _testName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop.TestPointerEnterAndExit
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene3DragAndDrop
+    _parentName: AltTester.AltDriver.Tests.TestForScene3DragAndDrop
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.280801
+    _testDuration: 0.926423
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene4NoCameras
+    _testName: AltTester.AltDriver.Tests.TestForScene4NoCameras
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
+    _parentName: AltTester.AltDriver.Tests
     _testCaseCount: 2
     _foldOut: 0
     _testResultMessage: 
@@ -3126,194 +3326,208 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 2
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene4NoCameras.TestFindElementInASceneWithNoCameras
+    _testName: AltTester.AltDriver.Tests.TestForScene4NoCameras.TestFindElementInASceneWithNoCameras
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene4NoCameras
+    _parentName: AltTester.AltDriver.Tests.TestForScene4NoCameras
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.0989246
+    _testDuration: 0.2050495
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene4NoCameras.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene4NoCameras.TestFindUIElementInASceneWithNoCameras
+    _testName: AltTester.AltDriver.Tests.TestForScene4NoCameras.TestFindUIElementInASceneWithNoCameras
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene4NoCameras
+    _parentName: AltTester.AltDriver.Tests.TestForScene4NoCameras
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.0716877
+    _testDuration: 0.2237962
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene4NoCameras.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
-    _testCaseCount: 10
-    _foldOut: 1
+    _parentName: AltTester.AltDriver.Tests
+    _testCaseCount: 11
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 10
+    _testSelectedCount: 11
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestButton
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestButton
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.2997703
+    _testDuration: 0.6199084
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestCameraMovement
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestCameraMovement
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 2.1674813
+    _testDuration: 2.2117122
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestCheckShadersSetCorrectlyAfterHighlight
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestCheckShadersSetCorrectlyAfterHighlight
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 1.5212099
+    _testDuration: 1.5573359
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestCreatingStars
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestCreatingStars
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 2.952912
+    _testDuration: 3.1021636
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestKeyboardPress
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestKeyboardPress
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 40.2000441
+    _testDuration: 46.5014007
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestKeyDownAndKeyUp
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestKeyDownAndKeyUp
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3366952
+    _testDuration: 0.3072325
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestMovementCube
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestMovementCube
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 3.1759785
+    _testDuration: 3.2544261
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestPowerJoystick
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestPowerJoystick
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.417814
+    _testDuration: 0.6876712
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestScroll
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestScroll
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 4.1690211
+    _testDuration: 4.2307636
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestScrollAndWait
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestScrollAndWait
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
     _testCaseCount: 1
-    _foldOut: 1
+    _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 2.1704516
+    _testDuration: 2.2624716
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestInputActions
+    _testName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput.TestUpdateAltObject
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: AltTester.AltDriver.Tests.TestForScene5KeyboardAndMouseInput
+    _testCaseCount: 1
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 2.248959
+    path: Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: AltTester.AltDriver.Tests.TestInputActions
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltDriver.Tests
+    _parentName: AltTester.AltDriver.Tests
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
@@ -3322,135 +3536,65 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 1
   - _selected: 1
-    _testName: Altom.AltDriver.Tests.TestInputActions.TestScrollAndWait
+    _testName: AltTester.AltDriver.Tests.TestInputActions.TestScrollAndWait
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltDriver.Tests.TestInputActions
+    _parentName: AltTester.AltDriver.Tests.TestInputActions
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.3954514
+    _testDuration: 0.3986159
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestInputActions.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltInstrumentation
-    _testAssembly: Assembly-CSharp-Editor
-    _status: 0
-    _isSuite: 1
-    _type: NUnit.Framework.Internal.TestSuite
-    _parentName: Altom
-    _testCaseCount: 2
-    _foldOut: 0
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: 
-    _testSelectedCount: 2
-  - _selected: 1
-    _testName: Altom.AltInstrumentation.Tests
+    _testName: PathSelectorTests
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
-    _type: NUnit.Framework.Internal.TestSuite
-    _parentName: Altom.AltInstrumentation
-    _testCaseCount: 2
+    _type: NUnit.Framework.Internal.TestFixture
+    _parentName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+    _testCaseCount: 40
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 2
+    _testSelectedCount: 40
   - _selected: 1
-    _testName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests
+    _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 1
-    _type: NUnit.Framework.Internal.TestFixture
-    _parentName: Altom.AltInstrumentation.Tests
-    _testCaseCount: 2
+    _type: NUnit.Framework.Internal.ParameterizedMethodSuite
+    _parentName: PathSelectorTests
+    _testCaseCount: 7
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 2
+    _testSelectedCount: 7
   - _selected: 1
-    _testName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests.TestConnectWithNoServer
+    _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@layer,\\[name\\])]","[name]")
     _testAssembly: Assembly-CSharp-Editor
     _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests
+    _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
     _testCaseCount: 1
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0.0049125
-    path: Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
+    _testDuration: 0.0018726
+    path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests.TestConnectWithServer
-    _testAssembly: Assembly-CSharp-Editor
-    _status: 1
-    _isSuite: 0
-    _type: NUnit.Framework.Internal.TestMethod
-    _parentName: Altom.AltInstrumentation.Tests.WebSocketClientCommunicationTests
-    _testCaseCount: 1
-    _foldOut: 0
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 2.0613978
-    path: Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
-    _testSelectedCount: 0
-  - _selected: 0
-    _testName: PathSelectorTests
-    _testAssembly: Assembly-CSharp-Editor
-    _status: 0
-    _isSuite: 1
-    _type: NUnit.Framework.Internal.TestFixture
-    _parentName: D:/Altom/altunitytester/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
-    _testCaseCount: 40
-    _foldOut: 0
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: 
-    _testSelectedCount: 0
-  - _selected: 0
-    _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions
-    _testAssembly: Assembly-CSharp-Editor
-    _status: 0
-    _isSuite: 1
-    _type: NUnit.Framework.Internal.ParameterizedMethodSuite
-    _parentName: PathSelectorTests
-    _testCaseCount: 7
-    _foldOut: 0
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: 
-    _testSelectedCount: 0
-  - _selected: 0
-    _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@layer,\\[name\\])]","[name]")
-    _testAssembly: Assembly-CSharp-Editor
-    _status: 0
-    _isSuite: 0
-    _type: NUnit.Framework.Internal.TestMethod
-    _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
-    _testCaseCount: 1
-    _foldOut: 0
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
-    _testSelectedCount: 0
-  - _selected: 0
     _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@tag,\\/na\\/me\\/)]","/na/me/")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
@@ -3458,13 +3602,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0006455
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@text,\\;na\\;me\\;)]",";na;me;")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
@@ -3472,13 +3616,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0005516
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@component,\\\\na\\\\me\\\\)]","\\na\\me\\")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
@@ -3486,13 +3630,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004653
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@name,\\&na\\&me\\&)]","&na&me&")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
@@ -3500,13 +3644,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0007576
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@tag,\\!na\\!me\\!)]","!na!me!")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
@@ -3514,13 +3658,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0008994
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideFunctions("//*[contains(@tag,\\(na\\)me\\()]","(na)me(")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideFunctions
@@ -3528,13 +3672,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0007208
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.ParameterizedMethodSuite
     _parentName: PathSelectorTests
@@ -3544,11 +3688,11 @@ MonoBehaviour:
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 0
-  - _selected: 0
+    _testSelectedCount: 10
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//\\[name\\]","[name]")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3556,13 +3700,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0022275
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//\\/name","/name")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3570,13 +3714,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004519
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//na\\/me","na/me")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3584,13 +3728,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003355
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//name\\/","name/")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3598,13 +3742,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003265
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//na\\;me","na;me")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3612,13 +3756,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003548
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//\\;name",";name")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3626,13 +3770,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003441
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//name\\;","name;")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3640,13 +3784,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003881
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//\\\\na\\\\me\\\\","\\na\\me\\")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3654,13 +3798,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003325
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//\\&na\\&me\\&","&na&me&")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3668,13 +3812,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003724
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideName("//\\!na\\!me\\!","!na!me!")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideName
@@ -3682,13 +3826,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0007276
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.ParameterizedMethodSuite
     _parentName: PathSelectorTests
@@ -3698,11 +3842,11 @@ MonoBehaviour:
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 0
-  - _selected: 0
+    _testSelectedCount: 6
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors("//*[@layer=\\[name\\]]","[name]")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideSelectors
@@ -3710,13 +3854,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0014414
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors("//*[@tag=\\/na\\/me\\/]","/na/me/")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideSelectors
@@ -3724,13 +3868,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0005648
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors("//*[@text=\\;na\\;me\\;]",";na;me;")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideSelectors
@@ -3738,13 +3882,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004643
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors("//*[@component=\\\\na\\\\me\\\\]","\\na\\me\\")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideSelectors
@@ -3752,13 +3896,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0005674
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors("//*[@name=\\&na\\&me\\&]","&na&me&")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideSelectors
@@ -3766,13 +3910,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0006756
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestEscapedCharactersInsideSelectors("//*[@tag=\\!na\\!me\\!]","!na!me!")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestEscapedCharactersInsideSelectors
@@ -3780,13 +3924,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0005324
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 1
     _type: NUnit.Framework.Internal.ParameterizedMethodSuite
     _parentName: PathSelectorTests
@@ -3796,12 +3940,12 @@ MonoBehaviour:
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 0
-  - _selected: 0
+    _testSelectedCount: 12
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("","Path must start with
       delimiter / or //")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3809,14 +3953,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0015297
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("///","Expected object
       name or *. Got ``")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3824,14 +3968,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004014
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//[@text=123]","Expected
       object name or *. Got `[@text=123]`")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3839,14 +3983,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004006
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//name[contains(@invalid,2)","Condition
       didn't end with ]. Got `name[contains(@invalid,2)`")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3854,14 +3998,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004455
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//name[invalid]","Expected
       index as a number got [invalid]")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3869,14 +4013,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0005117
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: 'PathSelectorTests.TestInvalidPathSelectors("//name[@invalid=22]","Invalid
       property type ''invalid''. Expected one of: id,name,tag,layer,component,text")'
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3884,14 +4028,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0013456
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//[1]","Expected object
       name or *. Got `[1]`")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3899,14 +4043,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004265
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//test////name","Expected
       object name or *. Got ``")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3914,14 +4058,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0005097
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//test///name","Expected
       object name or *. Got ``")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3929,14 +4073,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003931
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//name//..","Expected
       /, // or /..; got //..")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3944,14 +4088,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0003672
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//name\\","Final \\ must
       be escaped. Add another \\ at the end to escape it")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3959,14 +4103,14 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0002312
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestInvalidPathSelectors("//*[contains(@name,Pla]","Expected
       property selector format `function(@propertyName,propertyvalue)` Got contains(@name,Pla")
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests.TestInvalidPathSelectors
@@ -3974,97 +4118,97 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0004798
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestValidSelectors_Any
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0009875
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestValidSelectors_Function
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0019122
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestValidSelectors_Indexer
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0014027
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestValidSelectors_Name
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0009914
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: PathSelectorTests.TestValidSelectors_Property
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: PathSelectorTests
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0013894
     path: Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: D:/Altom/altunitytester/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
-    _testCaseCount: 15
+    _parentName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+    _testCaseCount: 18
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 0
-  - _selected: 0
+    _testSelectedCount: 18
+  - _selected: 1
     _testName: TestForNIS.TestBeginMoveEndTouch
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4072,13 +4216,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.3952986
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestCapsuleJumps
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4086,13 +4230,69 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
+    _testDuration: 0.3426178
+    path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: TestForNIS.TestCheckActionDoNotDoubleClick
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 1
+    _type: NUnit.Framework.Internal.ParameterizedMethodSuite
+    _parentName: TestForNIS
+    _testCaseCount: 3
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
     _testDuration: 0
+    path: 
+    _testSelectedCount: 3
+  - _selected: 1
+    _testName: TestForNIS.TestCheckActionDoNotDoubleClick(1)
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: TestForNIS.TestCheckActionDoNotDoubleClick
+    _testCaseCount: 1
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 2.5217089
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
+    _testName: TestForNIS.TestCheckActionDoNotDoubleClick(2)
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: TestForNIS.TestCheckActionDoNotDoubleClick
+    _testCaseCount: 1
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 4.3209344
+    path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
+    _testSelectedCount: 0
+  - _selected: 1
+    _testName: TestForNIS.TestCheckActionDoNotDoubleClick(3)
+    _testAssembly: Assembly-CSharp-Editor
+    _status: 1
+    _isSuite: 0
+    _type: NUnit.Framework.Internal.TestMethod
+    _parentName: TestForNIS.TestCheckActionDoNotDoubleClick
+    _testCaseCount: 1
+    _foldOut: 0
+    _testResultMessage: 
+    _testStackTrace: 
+    _testDuration: 6.0425368
+    path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
+    _testSelectedCount: 0
+  - _selected: 1
     _testName: TestForNIS.TestClickCoordinates
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4100,13 +4300,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.395786
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestClickElement
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4114,13 +4314,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.2391595
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestKeyDownAndKeyUp
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4128,13 +4328,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 29.8231768
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestMultipointSwipe
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4142,13 +4342,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 2.8415939
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestPressAllKeys
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4156,13 +4356,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 29.3466802
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestPressKey
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4170,13 +4370,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.9871307
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestPressKeys
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4184,13 +4384,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.37899
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestScroll
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4198,13 +4398,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.7446711
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestScrollElement
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4212,13 +4412,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 1.2899208
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestSwipe
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4226,13 +4426,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 1.2500344
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestTapCoordinates
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4240,13 +4440,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.1953603
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestTapElement
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4254,13 +4454,13 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.2366636
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestForNIS.TestTilt
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestForNIS
@@ -4268,24 +4468,24 @@ MonoBehaviour:
     _foldOut: 0
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 1.2201724
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestNotification
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: D:/Altom/altunitytester/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+    _parentName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
     _testCaseCount: 4
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
     _testDuration: 0
     path: 
-    _testSelectedCount: 0
-  - _selected: 0
+    _testSelectedCount: 4
+  - _selected: 1
     _testName: TestNotification.TestApplicationPaused
     _testAssembly: Assembly-CSharp-Editor
     _status: 0
@@ -4293,56 +4493,56 @@ MonoBehaviour:
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestNotification
     _testCaseCount: 1
-    _foldOut: 0
-    _testResultMessage: 
+    _foldOut: 1
+    _testResultMessage: Testing
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.0010665
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestNotification.TestLoadSceneNotification
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestNotification
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.182014
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestNotification.TestLogNotification
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestNotification
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.297279
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
     _testSelectedCount: 0
-  - _selected: 0
+  - _selected: 1
     _testName: TestNotification.TestUnloadSceneNotification
     _testAssembly: Assembly-CSharp-Editor
-    _status: 0
+    _status: 1
     _isSuite: 0
     _type: NUnit.Framework.Internal.TestMethod
     _parentName: TestNotification
     _testCaseCount: 1
-    _foldOut: 0
+    _foldOut: 1
     _testResultMessage: 
     _testStackTrace: 
-    _testDuration: 0
+    _testDuration: 0.2984147
     path: Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
     _testSelectedCount: 0
   - _selected: 1
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll
     _testAssembly: Unity.VisualStudio.Editor
     _status: 0
     _isSuite: 1
@@ -4356,7 +4556,7 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 0
   - _selected: 1
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/UnityEngine.TestRunner.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/UnityEngine.TestRunner.dll
     _testAssembly: UnityEngine.TestRunner
     _status: 0
     _isSuite: 1
@@ -4369,50 +4569,8 @@ MonoBehaviour:
     _testDuration: 0
     path: 
     _testSelectedCount: 0
-  - _selected: 0
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/AltTester.dll
-    _testAssembly: AltTester
-    _status: 0
-    _isSuite: 1
-    _type: NUnit.Framework.Internal.TestAssembly
-    _parentName: 
-    _testCaseCount: 1
-    _foldOut: 1
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: 
-    _testSelectedCount: 0
-  - _selected: 0
-    _testName: TestExample
-    _testAssembly: AltTester
-    _status: 0
-    _isSuite: 1
-    _type: NUnit.Framework.Internal.TestFixture
-    _parentName: D:/Altom/altunitytester/Library/ScriptAssemblies/AltTester.dll
-    _testCaseCount: 1
-    _foldOut: 1
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: 
-    _testSelectedCount: 0
-  - _selected: 0
-    _testName: TestExample.Test
-    _testAssembly: AltTester
-    _status: 0
-    _isSuite: 0
-    _type: NUnit.Framework.Internal.TestMethod
-    _parentName: TestExample
-    _testCaseCount: 1
-    _foldOut: 1
-    _testResultMessage: 
-    _testStackTrace: 
-    _testDuration: 0
-    path: Assets/AltTester/Editor/DefaultTestExample.txt
-    _testSelectedCount: 0
   - _selected: 1
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/UnityEditor.TestRunner.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/UnityEditor.TestRunner.dll
     _testAssembly: UnityEditor.TestRunner
     _status: 0
     _isSuite: 1
@@ -4426,7 +4584,7 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 0
   - _selected: 1
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/Unity.Rider.Editor.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Unity.Rider.Editor.dll
     _testAssembly: Unity.Rider.Editor
     _status: 0
     _isSuite: 1
@@ -4440,7 +4598,7 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 0
   - _selected: 0
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/Unity.InputSystem.IntegrationTests.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Unity.InputSystem.IntegrationTests.dll
     _testAssembly: Unity.InputSystem.IntegrationTests
     _status: 0
     _isSuite: 1
@@ -4459,7 +4617,7 @@ MonoBehaviour:
     _status: 0
     _isSuite: 1
     _type: NUnit.Framework.Internal.TestFixture
-    _parentName: D:/Altom/altunitytester/Library/ScriptAssemblies/Unity.InputSystem.IntegrationTests.dll
+    _parentName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Unity.InputSystem.IntegrationTests.dll
     _testCaseCount: 4
     _foldOut: 0
     _testResultMessage: 
@@ -4524,7 +4682,7 @@ MonoBehaviour:
     path: Packages/com.unity.inputsystem/Tests/IntegrationTests
     _testSelectedCount: 0
   - _selected: 1
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/AltTesterEditor.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/AltTesterEditor.dll
     _testAssembly: AltTesterEditor
     _status: 0
     _isSuite: 1
@@ -4538,7 +4696,7 @@ MonoBehaviour:
     path: 
     _testSelectedCount: 0
   - _selected: 1
-    _testName: D:/Altom/altunitytester/Library/ScriptAssemblies/Unity.InputSystem.TestFramework.dll
+    _testName: D:/github/AltTester-Unity-SDK/Library/ScriptAssemblies/Unity.InputSystem.TestFramework.dll
     _testAssembly: Unity.InputSystem.TestFramework
     _status: 0
     _isSuite: 1
@@ -4595,9 +4753,11 @@ MonoBehaviour:
   InputVisualizer: 0
   ShowPopUp: 1
   BuildLocationPath: 
-  LatestInspectorVersion: 
-  ShowInspectorPopUpInEditor: 0
+  LatestDesktopVersion: 1.5.1.exe
+  ShowDesktopPopUpInEditor: 0
   createXMLReport: 0
   xMLFilePath: 
-  AltTesterPort: 13000
+  ProxyPort: 13000
+  ProxyHost: 127.0.0.1
+  GameName: __default__
   KeepAUTSymbolDefined: 1
diff --git a/Assets/AltTester/Editor/AltTesterEditorWindow.cs b/Assets/AltTester/Editor/AltTesterEditorWindow.cs
index 2ff0b71c6..d2083da44 100644
--- a/Assets/AltTester/Editor/AltTesterEditorWindow.cs
+++ b/Assets/AltTester/Editor/AltTesterEditorWindow.cs
@@ -4,15 +4,16 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
-using Altom.AltDriver;
-using Altom.AltTester;
-using Altom.AltTesterEditor.Logging;
+using AltTester.AltDriver;
+using AltTester;
+using AltTesterEditor.Logging;
 using Unity.EditorCoroutines.Editor;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
+using UnityEngine.Networking;
 
-namespace Altom.AltTesterEditor
+namespace AltTesterEditor
 {
     public class AltTesterEditorWindow : UnityEditor.EditorWindow
     {
@@ -23,7 +24,7 @@ public class AltTesterEditorWindow : UnityEditor.EditorWindow
         public static AltTesterEditorWindow Window;
         public static int SelectedTest = -1;
 
-        //TestResult after running a test
+        // TestResult after running a test
         public static bool IsTestRunResultAvailable = false;
         public static int ReportTestPassed;
         public static int ReportTestFailed;
@@ -70,8 +71,8 @@ public class AltTesterEditorWindow : UnityEditor.EditorWindow
 
         private static UnityEngine.GUIStyle labelStyle;
 
-
         private static long timeSinceLastClick;
+        private static UnityEngine.Font font;
         private static UnityEngine.Networking.UnityWebRequest www;
         private UnityEngine.Vector2 scrollPositionTestResult;
 
@@ -109,8 +110,6 @@ public class AltTesterEditorWindow : UnityEditor.EditorWindow
         UnityEngine.Rect availableRect;
         UnityEngine.Rect availableRectHorizontal;
 
-
-        private static UnityEngine.Font font;
         private bool playInEditorPressed;
         #region UnityEditor MenuItems
         // Add menu item named "My Window" to the Window menu
@@ -140,7 +139,7 @@ public static void CreateAltTest()
 #else
             System.Reflection.MethodInfo method = typeof(UnityEditor.ProjectWindowUtil).GetMethod("CreateScriptAsset", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
             if (method == null)
-                throw new Altom.AltDriver.NotFoundException("Method to create Script file was not found");
+                throw new AltTester.AltDriver.NotFoundException("Method to create Script file was not found");
             method.Invoke((object)null, new object[2]
             {
                 (object) templatePath,
@@ -392,11 +391,6 @@ protected void OnFocus()
                 SelectedTestsCountTexture = MakeTexture(20, 20, grayColor);
             }
 
-            if (PortForwardingTexture == null)
-            {
-                PortForwardingTexture = MakeTexture(20, 20, greenColor);
-            }
-
             getListOfSceneFromEditor();
         }
 
@@ -578,7 +572,6 @@ protected void DrawGUI()
             displayScenes();
             UnityEditor.EditorGUILayout.Separator();
 
-            displayPortForwarding(leftSide);
             UnityEditor.EditorGUILayout.EndVertical();
             UnityEditor.EditorGUILayout.EndScrollView();
             UnityEditor.EditorGUILayout.EndScrollView();
@@ -641,10 +634,10 @@ protected void DrawGUI()
                     {
                         AltBuilder.BuildStandaloneFromUI(EditorConfiguration.StandaloneTarget, autoRun: false);
                     }
-                    // else if (EditorConfiguration.platform == AltPlatform.WebGL)
-                    // {
-                    //     AltBuilder.BuildWebGLFromUI(autoRun: false);
-                    // }
+                    else if (EditorConfiguration.platform == AltPlatform.WebGL)
+                    {
+                        AltBuilder.BuildWebGLFromUI(autoRun: false);
+                    }
                     else
                     {
                         runInEditor();
@@ -697,10 +690,10 @@ protected void DrawGUI()
                     {
                         AltBuilder.BuildStandaloneFromUI(EditorConfiguration.StandaloneTarget, autoRun: true);
                     }
-                    // else if (EditorConfiguration.platform == AltPlatform.WebGL)
-                    // {
-                    //     AltBuilder.BuildWebGLFromUI(autoRun: true);
-                    // }
+                    else if (EditorConfiguration.platform == AltPlatform.WebGL)
+                    {
+                        AltBuilder.BuildWebGLFromUI(autoRun: true);
+                    }
                     UnityEngine.GUIUtility.ExitGUI();
                 }
 
@@ -858,7 +851,7 @@ private BuildTargetGroup getBuildTargetGroupFromAltPlatform(AltPlatform altPlatf
 #if UNITY_EDITOR_OSX
                 AltPlatform.iOS => BuildTargetGroup.iOS,
 #endif
-                // AltPlatform.WebGL => BuildTargetGroup.WebGL,
+                AltPlatform.WebGL => BuildTargetGroup.WebGL,
                 _ => throw new NotImplementedException(),
             };
         }
@@ -868,7 +861,7 @@ private static AltPlatform getAltPlatformFromBuildTargetGroup(BuildTargetGroup t
             {
                 BuildTargetGroup.Standalone => AltPlatform.Standalone,
                 BuildTargetGroup.Android => AltPlatform.Android,
-                // BuildTargetGroup.WebGL => AltPlatform.WebGL,
+                BuildTargetGroup.WebGL => AltPlatform.WebGL,
 #if UNITY_EDITOR_OSX
                 BuildTargetGroup.iOS => AltPlatform.Standalone,
 #endif
@@ -886,7 +879,7 @@ private BuildTarget[] getBuildTargetFromAltPlatform(AltPlatform altPlatform)
 #if UNITY_EDITOR_OSX
                 AltPlatform.iOS => new BuildTarget[] { BuildTarget.iOS },
 #endif
-                // AltPlatform.WebGL => new BuildTarget[] { BuildTarget.WebGL },
+                AltPlatform.WebGL => new BuildTarget[] { BuildTarget.WebGL },
                 _ => throw new NotImplementedException(),
             };
         }
@@ -952,10 +945,10 @@ private void displayPlatformAndPlatformSettings(float size)
                     showSettings(UnityEditor.BuildTargetGroup.iOS, AltPlatform.iOS);
                     break;
 #endif
-                    // case AltPlatform.WebGL:
-                    //     EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WebGL, BuildTarget.WebGL);
-                    //     showSettings(UnityEditor.BuildTargetGroup.WebGL, AltPlatform.WebGL);
-                    //     break;
+                case AltPlatform.WebGL:
+                    EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WebGL, BuildTarget.WebGL);
+                    showSettings(UnityEditor.BuildTargetGroup.WebGL, AltPlatform.WebGL);
+                    break;
             }
             checkAltTesterSymbol();
 
@@ -1209,10 +1202,11 @@ private void displayBuildSettings()
                 var keepATSymbolChanged = labelAndCheckboxHorizontalLayout("Keep ALTTESTER symbol defined", ref EditorConfiguration.KeepAUTSymbolDefined);
                 if (keepATSymbolChanged)
                     checkAltTesterSymbol();
-
-                labelAndInputFieldHorizontalLayout("AltTester Port*", ref EditorConfiguration.AltTesterPort);
+                labelAndInputFieldHorizontalLayout("Proxy Host*", ref EditorConfiguration.ProxyHost);
+                labelAndInputFieldHorizontalLayout("AltTester Port*", ref EditorConfiguration.ProxyPort);
 
 
+                labelAndInputFieldHorizontalLayout("Game Name", ref EditorConfiguration.GameName);
             }
             GUIStyle style = new GUIStyle(GUI.skin.label)
             {
diff --git a/Assets/AltTester/Editor/DefaultTestExample.txt b/Assets/AltTester/Editor/DefaultTestExample.txt
index a884f6cdc..0d2d5bd28 100644
--- a/Assets/AltTester/Editor/DefaultTestExample.txt
+++ b/Assets/AltTester/Editor/DefaultTestExample.txt
@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using Altom.AltDriver;
+using AltTester.AltDriver;
 
 public class #SCRIPTNAME#
 {   //Important! If your test file is inside a folder that contains an .asmdef file, please make sure that the assembly definition references NUnit.
diff --git a/Assets/AltTester/Editor/Logging/EditorLogManager.cs b/Assets/AltTester/Editor/Logging/EditorLogManager.cs
index abea6f8b4..a9ade8499 100644
--- a/Assets/AltTester/Editor/Logging/EditorLogManager.cs
+++ b/Assets/AltTester/Editor/Logging/EditorLogManager.cs
@@ -1,9 +1,9 @@
 using System;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 using NLog;
 using NLog.Layouts;
 
-namespace Altom.AltTesterEditor.Logging
+namespace AltTesterEditor.Logging
 {
     public class EditorLogManager
     {
diff --git a/Assets/AltTester/Examples/Scripts/AltNIPDebugScript.cs b/Assets/AltTester/Examples/Scripts/AltNIPDebugScript.cs
index 4fe420b48..47d057e20 100644
--- a/Assets/AltTester/Examples/Scripts/AltNIPDebugScript.cs
+++ b/Assets/AltTester/Examples/Scripts/AltNIPDebugScript.cs
@@ -1,6 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
-using Altom.AltTester;
+using AltTester;
 using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/Commands/AltCommandsTests.cs b/Assets/AltTester/Examples/Test/Editor/Driver/Commands/AltCommandsTests.cs
index 8f1ba96f7..21ce9095a 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/Commands/AltCommandsTests.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/Commands/AltCommandsTests.cs
@@ -1,9 +1,9 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     public class AltCommandsTests
     {
@@ -24,16 +24,16 @@ public void TearDown()
         }
 
         [Test]
-        [Category("WebGLUnsupported")]
+        [Category("WebGLUnsupported")] //in WebGL we do not save logs to file but in the console
         public void TestSetServerLogging()
         {
-            var rule = altDriver.CallStaticMethod<dynamic>("Altom.AltTester.Logging.ServerLogManager", "Instance.Configuration.FindRuleByName", "Assembly-CSharp", new[] { "AltServerFileRule" }, null);
+            var rule = altDriver.CallStaticMethod<dynamic>("AltTester.Logging.ServerLogManager", "Instance.Configuration.FindRuleByName", "Assembly-CSharp", new[] { "AltServerFileRule" }, null);
 
             var levels = (JArray)rule["Levels"];
             Assert.AreEqual(5, levels.Count, levels.ToString());
 
             altDriver.SetServerLogging(AltLogger.File, AltLogLevel.Off);
-            rule = altDriver.CallStaticMethod<dynamic>("Altom.AltTester.Logging.ServerLogManager", "Instance.Configuration.FindRuleByName", "Assembly-CSharp", new[] { "AltServerFileRule" }, null);
+            rule = altDriver.CallStaticMethod<dynamic>("AltTester.Logging.ServerLogManager", "Instance.Configuration.FindRuleByName", "Assembly-CSharp", new[] { "AltServerFileRule" }, null);
             levels = (JArray)rule["Levels"];
             Assert.AreEqual(0, levels.Count, levels.ToString());
         }
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/MockClasses/MockNotificationCallBacks.cs b/Assets/AltTester/Examples/Test/Editor/Driver/MockClasses/MockNotificationCallBacks.cs
index 7b2cacc63..0910757f5 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/MockClasses/MockNotificationCallBacks.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/MockClasses/MockNotificationCallBacks.cs
@@ -1,7 +1,7 @@
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.Notifications;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Notifications;
 
-namespace Altom.AltDriver.MockClasses
+namespace AltTester.AltDriver.MockClasses
 {
     internal class MockNotificationCallBacks : INotificationCallbacks
     {
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs
index 065a78704..7e22097f9 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs
@@ -1,7 +1,6 @@
-using System.Threading;
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.Tests;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Tests;
 using NUnit.Framework;
 
 public class TestBase
diff --git a/Assets/AltTester/AltServer/Communication/WebSocketServerCommunication.cs.meta b/Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs.meta
similarity index 83%
rename from Assets/AltTester/AltServer/Communication/WebSocketServerCommunication.cs.meta
rename to Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs.meta
index ee86cfe3e..cd928be4e 100644
--- a/Assets/AltTester/AltServer/Communication/WebSocketServerCommunication.cs.meta
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestBase.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 23c86e46fd6341648ad0d47ff382c2a0
+guid: 74cb90d2c4a87f644a184328ac7cc05a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
index f13fb5c9e..de017f2b8 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestForNIS.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
-using Altom.AltDriver;
-using Altom.AltDriver.Tests;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Tests;
 using NUnit.Framework;
 
 public class TestForNIS
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
index 3d429ced9..2e160c683 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene3DragAndDrop.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Threading;
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
 using NUnit.Framework;
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     [Timeout(10000)]
     public class TestForScene3DragAndDrop : TestBase
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene4NoCameras.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene4NoCameras.cs
index 90ac99726..cdb8e7634 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene4NoCameras.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene4NoCameras.cs
@@ -1,8 +1,8 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
 using NUnit.Framework;
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     public class TestForScene4NoCameras : TestBase
     {
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
index 633988c5e..2d06d6648 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestForScene5KeyboardAndMouseInput.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
 using NUnit.Framework;
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     public class TestForScene5KeyboardAndMouseInput : TestBase
     {
@@ -190,7 +190,6 @@ public void TestScrollAndWait()
         }
 
         [Test]
-        [Category("WebGLUnsupported")]
         public void TestCheckShadersSetCorrectlyAfterHighlight()
         {
             var cube = altDriver.FindObject(By.NAME, "2MaterialCube");
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
index 8bf56b776..4b0b17c40 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestForscene2DraggablePanel.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Logging;
 using NUnit.Framework;
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     [Timeout(10000)]
     public class TestForScene2DraggablePanel : TestBase
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestInputActions.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestInputActions.cs
index c654fd2c4..d021af66c 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestInputActions.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestInputActions.cs
@@ -1,9 +1,9 @@
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Logging;
 using NUnit.Framework;
 
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     public class TestInputActions : TestBase
     {
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
index 4b7ed0669..cbb48eb60 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestNotification.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Threading;
-using Altom.AltDriver;
-using Altom.AltDriver.Logging;
-using Altom.AltDriver.MockClasses;
-using Altom.AltDriver.Notifications;
 using NUnit.Framework;
-using Altom.AltDriver.Tests;
+using AltTester.AltDriver.MockClasses;
+using AltTester.AltDriver.Logging;
+using AltTester.AltDriver.Notifications;
+using AltTester.AltDriver;
+using AltTester.AltDriver.Tests;
 
 public class TestNotification
 {
@@ -76,12 +76,12 @@ public void TestLogNotification()
         Assert.AreEqual(AltLogLevel.Debug, MockNotificationCallBacks.LogLevel);
     }
 
-    // [Test]
-    // [Ignore("Testing")]
-    // public void TestApplicationPaused()
-    // {
-    //     var altElement = altDriver.FindObject(By.NAME, "AltTesterPrefab");
-    //     altElement.CallComponentMethod<string>("Altom.AltTester.AltRunner", "OnApplicationPause", new object[] { true }, new string[] { "System.Boolean" }, "Assembly-CSharp");
-    //     Assert.IsTrue(MockNotificationCallBacks.ApplicationPaused);
-    // }
+    [Test]
+    [Ignore("Testing")]
+    public void TestApplicationPaused()
+    {
+        var altElement = altDriver.FindObject(By.NAME, "AltTesterPrefab");
+        altElement.CallComponentMethod<string>("Altom.AltTester.AltRunner", "OnApplicationPause", "Assembly-CSharp", new object[] { true }, new string[] { "System.Boolean" });
+        Assert.IsTrue(MockNotificationCallBacks.ApplicationPaused);
+    }
 }
\ No newline at end of file
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs b/Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
index 451cbb09c..5c554ac69 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/Testforscene1TestSample.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Threading;
 using NUnit.Framework;
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     [Timeout(30000)]
     public class TestForScene1TestSample : TestBase
@@ -220,13 +219,13 @@ public void TestFindObjectByComponent2()
         [Test]
         public void TestGetComponentProperty()
         {
-            const string componentName = "Altom.AltTester.AltRunner";
+            const string componentName = "AltTester.AltRunner";
             const string propertyName = "InstrumentationSettings.ProxyPort";
             var altElement = altDriver.FindObject(By.NAME, "AltTesterPrefab");
             Assert.NotNull(altElement);
             var propertyValue = altElement.GetComponentProperty<int>(componentName, propertyName, "Assembly-CSharp");
             string portStr = System.Environment.GetEnvironmentVariable("PROXY_PORT");
-            if (string.IsNullOrEmpty(portStr)) portStr = "13000";
+            if (string.IsNullOrEmpty(portStr)) portStr = "13010";
             int port = int.Parse(portStr);
 
             Assert.AreEqual(port, propertyValue);
@@ -235,7 +234,7 @@ public void TestGetComponentProperty()
         [Test]
         public void TestGetComponentPropertyInvalidDeserialization()
         {
-            const string componentName = "Altom.AltTester.AltRunner";
+            const string componentName = "AltTester.AltRunner";
             const string propertyName = "InstrumentationSettings.ShowPopUp";
             var altElement = altDriver.FindObject(By.NAME, "AltTesterPrefab");
             try
@@ -253,7 +252,7 @@ public void TestGetComponentPropertyInvalidDeserialization()
         public void TestGetComponentPropertyNotFoundWithAssembly()
         {
             Thread.Sleep(1000);
-            const string componentName = "Altom.AltTester.AltRunner";
+            const string componentName = "AltTester.AltRunner";
             const string propertyName = "InvalidProperty";
             var altElement = altDriver.FindObject(By.NAME, "AltTesterPrefab");
             Assert.NotNull(altElement);
@@ -278,7 +277,7 @@ public void TestFindObjectsByComponent()
         public void TestGetNonExistingComponentProperty()
         {
             Thread.Sleep(1000);
-            const string componentName = "Altom.AltTester.AltRunner";
+            const string componentName = "AltTester.AltRunner";
             const string propertyName = "socketPort";
             var altElement = altDriver.FindObject(By.NAME, "AltTesterPrefab");
             Assert.NotNull(altElement);
@@ -539,7 +538,7 @@ public void TestCallMethodWithIncorrectNumberOfParameters2()
 
 
         [Test]
-        public void TestCallMethodAssmeblyNotFound()
+        public void TestCallMethodAssemblyNotFound()
         {
             const string componentName = "RandomComponent";
             const string methodName = "TestMethodWithManyParameters";
@@ -2049,13 +2048,11 @@ public void TestClickOnChangingSceneButton()
 
 
         [Test]
-        //uses InvokeMethod
-        [Category("WebGLUnsupported")]
         public void TestGetStaticProperty()
         {
-            altDriver.CallStaticMethod<string>("UnityEngine.Screen", "SetResolution", "UnityEngine.CoreModule", new string[] { "1920", "1080", "true" }, new string[] { "System.Int32", "System.Int32", "System.Boolean" });
-            var width = altDriver.GetStaticProperty<int>("UnityEngine.Screen", "currentResolution.width", "UnityEngine.CoreModule");
-            Assert.AreEqual(1920, width);
+            var screenOrientation = altDriver.GetStaticProperty<int>("UnityEngine.Screen", "orientation", "UnityEngine.CoreModule");
+            Assert.GreaterOrEqual(screenOrientation, 1);
+            Assert.LessOrEqual(screenOrientation, 4);
         }
 
         [Test]
@@ -2155,9 +2152,9 @@ public void TestOpenDialogWithBeginEndTouch()
         public void TestResetInput()
         {
             altDriver.KeyDown(AltKeyCode.P, 1);
-            Assert.True(altDriver.FindObject(By.NAME, "AltTesterPrefab").GetComponentProperty<bool>("Altom.AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp"));
+            Assert.True(altDriver.FindObject(By.NAME, "AltTesterPrefab").GetComponentProperty<bool>("AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp"));
             altDriver.ResetInput();
-            Assert.False(altDriver.FindObject(By.NAME, "AltTesterPrefab").GetComponentProperty<bool>("Altom.AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp"));
+            Assert.False(altDriver.FindObject(By.NAME, "AltTesterPrefab").GetComponentProperty<bool>("AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp"));
 
             int countKeyDown = altDriver.FindObject(By.NAME, "AltTesterPrefab").GetComponentProperty<int>("Input", "_keyCodesPressed.Count", "Assembly-CSharp");
             Assert.AreEqual(0, countKeyDown);
diff --git a/Assets/AltTester/Examples/Test/Editor/Driver/TestsHelper.cs b/Assets/AltTester/Examples/Test/Editor/Driver/TestsHelper.cs
index 08c35f256..2a30c8ece 100644
--- a/Assets/AltTester/Examples/Test/Editor/Driver/TestsHelper.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Driver/TestsHelper.cs
@@ -1,11 +1,11 @@
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     public class TestsHelper
     {
         public static int GetAltDriverPort()
         {
-            string port = System.Environment.GetEnvironmentVariable("ALTDRIVER_PORT");
+            string port = System.Environment.GetEnvironmentVariable("PROXY_PORT");
             if (!string.IsNullOrEmpty(port))
             {
                 return int.Parse(port);
@@ -16,7 +16,7 @@ public static int GetAltDriverPort()
 
         public static string GetAltDriverHost()
         {
-            string host = System.Environment.GetEnvironmentVariable("ALTDRIVER_HOST");
+            string host = System.Environment.GetEnvironmentVariable("PROXY_HOST");
             if (!string.IsNullOrEmpty(host))
             {
                 return host;
diff --git a/Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs b/Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
index e81210a3a..659c01322 100644
--- a/Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Server/PathSelectorTests.cs
@@ -1,5 +1,5 @@
-using Altom.AltDriver;
-using Altom.AltTester.Commands;
+using AltTester.AltDriver;
+using AltTester.Commands;
 using NUnit.Framework;
 
 public class PathSelectorTests
diff --git a/Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs b/Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
index 0ff5f251f..d4d484eb8 100644
--- a/Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
+++ b/Assets/AltTester/Examples/Test/Editor/Server/WebSocketClientCommunicationTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics;
-using Altom.AltTester.Communication;
-using AltWebSocketSharp;
-using AltWebSocketSharp.Server;
+using AltTester.Communication;
 using NUnit.Framework;
+using AltWebSocketSharp.Server;
+using AltWebSocketSharp;
 
 namespace Altom.AltInstrumentation.Tests
 {
@@ -11,6 +11,9 @@ public class MockCommandHandler : ICommandHandler
     {
         public SendMessageHandler OnSendMessage { get; set; }
 
+        public NotificationHandler OnDriverConnect { get; set; }
+        public NotificationHandler OnDriverDisconnect { get; set; }
+
         public void OnMessage(string data)
         {
             throw new System.NotImplementedException();
@@ -25,8 +28,6 @@ public void Send(string data)
         }
     }
 
-
-
     public class MockServerHandler : WebSocketBehavior
     {
         protected override void OnOpen()
@@ -45,6 +46,7 @@ protected override void OnError(ErrorEventArgs e)
         }
 
     }
+
     public class WebSocketClientCommunicationTests
     {
 
@@ -53,7 +55,7 @@ public void TestConnectWithNoServer()
         {
             var cmdHandler = new MockCommandHandler();
 
-            var client = new WebSocketClientCommunication(cmdHandler, "localhost", 13420);
+            var client = new WebSocketClientCommunication(cmdHandler, "localhost", 13420, "__default__");
             bool onConnect = false;
             client.OnConnect += () =>
             {
@@ -98,7 +100,7 @@ public void TestConnectWithServer()
                 bool connected = false;
                 bool disconnected = false;
 
-                var client = new WebSocketClientCommunication(cmdHandler, "localhost", 13420);
+                var client = new WebSocketClientCommunication(cmdHandler, "localhost", 13420, "__default__");
 
                 client.OnConnect += () =>
                 {
diff --git a/Assets/AltTester/Prefab/AltTesterPrefab.prefab b/Assets/AltTester/Prefab/AltTesterPrefab.prefab
index a4f9792c5..129bc874b 100644
--- a/Assets/AltTester/Prefab/AltTesterPrefab.prefab
+++ b/Assets/AltTester/Prefab/AltTesterPrefab.prefab
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &461430681369834360
+--- !u!1 &10285523652890483
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,58 +8,58 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6865383704053260367}
-  - component: {fileID: 190332139666413837}
-  - component: {fileID: 8968025562674945957}
+  - component: {fileID: 3099150881029014954}
+  - component: {fileID: 5604513869533128247}
+  - component: {fileID: 2618149272756237905}
   m_Layer: 0
-  m_Name: Title
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6865383704053260367
+--- !u!224 &3099150881029014954
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 461430681369834360}
+  m_GameObject: {fileID: 10285523652890483}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1418208516839357092}
+  m_Father: {fileID: 8304018292803917035}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -31}
-  m_SizeDelta: {x: 300, y: 75}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &190332139666413837
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5604513869533128247
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 461430681369834360}
+  m_GameObject: {fileID: 10285523652890483}
   m_CullTransparentMesh: 1
---- !u!114 &8968025562674945957
+--- !u!114 &2618149272756237905
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 461430681369834360}
+  m_GameObject: {fileID: 10285523652890483}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,7 +68,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 30
+    m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -79,8 +79,8 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: AltTester v.1.8.2
---- !u!1 &1355087064177554034
+  m_Text: Restart
+--- !u!1 &317154317761755472
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -88,82 +88,79 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1418208516839357092}
-  - component: {fileID: 3237452501835324968}
-  - component: {fileID: 3260383888335489862}
+  - component: {fileID: 1641534143240905910}
+  - component: {fileID: 1461785136516597558}
+  - component: {fileID: 1251523043746177562}
   m_Layer: 0
-  m_Name: Dialog
+  m_Name: Placeholder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1418208516839357092
+--- !u!224 &1641534143240905910
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1355087064177554034}
+  m_GameObject: {fileID: 317154317761755472}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6865383704053260367}
-  - {fileID: 2363855286177287056}
-  - {fileID: 1060224340188328378}
-  - {fileID: 6637697637156526189}
-  - {fileID: 2654083555359686022}
-  - {fileID: 6030122892160139382}
-  - {fileID: 5814578436793974781}
-  m_Father: {fileID: 698651906575015664}
-  m_RootOrder: 0
+  m_Children: []
+  m_Father: {fileID: 8358375899040149343}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 440, y: 440}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3237452501835324968
+--- !u!222 &1461785136516597558
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1355087064177554034}
+  m_GameObject: {fileID: 317154317761755472}
   m_CullTransparentMesh: 1
---- !u!114 &3260383888335489862
+--- !u!114 &1251523043746177562
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1355087064177554034}
+  m_GameObject: {fileID: 317154317761755472}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0.6470588, b: 0.1411765, a: 1}
+  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &1402195374302207265
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Enter game name...
+--- !u!1 &324886965155536395
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -171,79 +168,84 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 184640247866760048}
-  - component: {fileID: 9103672158048433382}
-  - component: {fileID: 5885946699865102600}
+  - component: {fileID: 2025872396341108583}
+  - component: {fileID: 1544444852692323465}
+  - component: {fileID: 6179567792600487058}
   m_Layer: 0
-  m_Name: Text
+  m_Name: Dialog
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &184640247866760048
+--- !u!224 &2025872396341108583
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1402195374302207265}
+  m_GameObject: {fileID: 324886965155536395}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2654083555359686022}
+  m_Children:
+  - {fileID: 7107267703016578963}
+  - {fileID: 5076835906871760337}
+  - {fileID: 8641514271335108404}
+  - {fileID: 4669032243788926043}
+  - {fileID: 5574091098227206381}
+  - {fileID: 8358375899040149343}
+  - {fileID: 8304018292803917035}
+  - {fileID: 1631572687043238285}
+  - {fileID: 7431593989707602052}
+  m_Father: {fileID: 658334975836887177}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 440, y: 600}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9103672158048433382
+--- !u!222 &1544444852692323465
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1402195374302207265}
+  m_GameObject: {fileID: 324886965155536395}
   m_CullTransparentMesh: 1
---- !u!114 &5885946699865102600
+--- !u!114 &6179567792600487058
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1402195374302207265}
+  m_GameObject: {fileID: 324886965155536395}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0, g: 0.6470588, b: 0.1411765, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Restart
---- !u!1 &1526827505669231093
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &621419571185653203
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -251,75 +253,79 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1231975873686759998}
-  - component: {fileID: 3808096640890914464}
-  - component: {fileID: 3006854312973386626}
+  - component: {fileID: 7506753605745758196}
+  - component: {fileID: 3710771653197337881}
+  - component: {fileID: 8466805805671048750}
   m_Layer: 0
-  m_Name: Checkmark
+  m_Name: Placeholder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1231975873686759998
+--- !u!224 &7506753605745758196
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1526827505669231093}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_GameObject: {fileID: 621419571185653203}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 229047808239693275}
-  m_RootOrder: 0
+  m_Father: {fileID: 5574091098227206381}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3808096640890914464
+--- !u!222 &3710771653197337881
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1526827505669231093}
+  m_GameObject: {fileID: 621419571185653203}
   m_CullTransparentMesh: 1
---- !u!114 &3006854312973386626
+--- !u!114 &8466805805671048750
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1526827505669231093}
+  m_GameObject: {fileID: 621419571185653203}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &1636434882501669161
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Enter port number...
+--- !u!1 &886402527714355695
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -327,54 +333,53 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6637697637156526189}
-  - component: {fileID: 423888165742007590}
-  - component: {fileID: 4977197202105835459}
-  - component: {fileID: 2512445088334003303}
+  - component: {fileID: 8304018292803917035}
+  - component: {fileID: 7194236844366982799}
+  - component: {fileID: 1099116456080019096}
+  - component: {fileID: 3522253570947247987}
   m_Layer: 0
-  m_Name: PortInputField
+  m_Name: RestartButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6637697637156526189
+--- !u!224 &8304018292803917035
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1636434882501669161}
+  m_GameObject: {fileID: 886402527714355695}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 826954983450758049}
-  - {fileID: 874416383060627722}
-  m_Father: {fileID: 1418208516839357092}
-  m_RootOrder: 3
+  - {fileID: 3099150881029014954}
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -80}
+  m_AnchoredPosition: {x: 0, y: -245}
   m_SizeDelta: {x: 240, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &423888165742007590
+--- !u!222 &7194236844366982799
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1636434882501669161}
+  m_GameObject: {fileID: 886402527714355695}
   m_CullTransparentMesh: 1
---- !u!114 &4977197202105835459
+--- !u!114 &1099116456080019096
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1636434882501669161}
+  m_GameObject: {fileID: 886402527714355695}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -398,16 +403,16 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &2512445088334003303
+--- !u!114 &3522253570947247987
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1636434882501669161}
+  m_GameObject: {fileID: 886402527714355695}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -438,133 +443,11 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 4977197202105835459}
-  m_TextComponent: {fileID: 5682891835195880762}
-  m_Placeholder: {fileID: 9161107025547903138}
-  m_ContentType: 0
-  m_InputType: 0
-  m_AsteriskChar: 42
-  m_KeyboardType: 0
-  m_LineType: 0
-  m_HideMobileInput: 0
-  m_CharacterValidation: 0
-  m_CharacterLimit: 0
-  m_OnSubmit:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnDidEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_CustomCaretColor: 0
-  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
-  m_CaretBlinkRate: 0.85
-  m_CaretWidth: 1
-  m_ReadOnly: 0
-  m_ShouldActivateOnSelect: 1
---- !u!1 &2613083609195509008
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 229047808239693275}
-  - component: {fileID: 2739149161994669699}
-  - component: {fileID: 2138399116387115889}
-  - component: {fileID: 5204126929809618821}
-  m_Layer: 0
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &229047808239693275
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2613083609195509008}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1231975873686759998}
-  m_Father: {fileID: 5814578436793974781}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2739149161994669699
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2613083609195509008}
-  m_CullTransparentMesh: 1
---- !u!114 &2138399116387115889
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2613083609195509008}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
+  m_TargetGraphic: {fileID: 1099116456080019096}
+  m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &5204126929809618821
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2613083609195509008}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: 20
-  m_MinHeight: 20
-  m_PreferredWidth: 20
-  m_PreferredHeight: 20
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
---- !u!1 &3227753749191449611
+--- !u!1 &2373991094671943220
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -572,9 +455,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2363855286177287056}
-  - component: {fileID: 4610672709678262294}
-  - component: {fileID: 8909593898213454557}
+  - component: {fileID: 5076835906871760337}
+  - component: {fileID: 6641283940814119993}
+  - component: {fileID: 4825339984740297780}
   m_Layer: 0
   m_Name: Message
   m_TagString: Untagged
@@ -582,41 +465,41 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2363855286177287056
+--- !u!224 &5076835906871760337
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3227753749191449611}
+  m_GameObject: {fileID: 2373991094671943220}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1418208516839357092}
+  m_Father: {fileID: 2025872396341108583}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 60}
-  m_SizeDelta: {x: 400, y: 100}
+  m_AnchoredPosition: {x: 0, y: 100}
+  m_SizeDelta: {x: 400, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4610672709678262294
+--- !u!222 &6641283940814119993
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3227753749191449611}
+  m_GameObject: {fileID: 2373991094671943220}
   m_CullTransparentMesh: 1
---- !u!114 &8909593898213454557
+--- !u!114 &4825339984740297780
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3227753749191449611}
+  m_GameObject: {fileID: 2373991094671943220}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@@ -644,7 +527,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Starting communication protocol!
---- !u!1 &3355868834703407528
+--- !u!1 &2426969341063749656
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -652,53 +535,54 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2654083555359686022}
-  - component: {fileID: 4342429188962666446}
-  - component: {fileID: 1992637979163270160}
-  - component: {fileID: 7375846880575371418}
+  - component: {fileID: 5574091098227206381}
+  - component: {fileID: 8979199747709462451}
+  - component: {fileID: 6161522942202778277}
+  - component: {fileID: 2151151441147216545}
   m_Layer: 0
-  m_Name: RestartButton
+  m_Name: PortInputField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2654083555359686022
+--- !u!224 &5574091098227206381
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3355868834703407528}
+  m_GameObject: {fileID: 2426969341063749656}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 184640247866760048}
-  m_Father: {fileID: 1418208516839357092}
+  - {fileID: 8700682341986467457}
+  - {fileID: 7506753605745758196}
+  m_Father: {fileID: 2025872396341108583}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -120}
+  m_AnchoredPosition: {x: 0, y: -155}
   m_SizeDelta: {x: 240, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4342429188962666446
+--- !u!222 &8979199747709462451
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3355868834703407528}
+  m_GameObject: {fileID: 2426969341063749656}
   m_CullTransparentMesh: 1
---- !u!114 &1992637979163270160
+--- !u!114 &6161522942202778277
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3355868834703407528}
+  m_GameObject: {fileID: 2426969341063749656}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -722,16 +606,16 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &7375846880575371418
+--- !u!114 &2151151441147216545
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3355868834703407528}
+  m_GameObject: {fileID: 2426969341063749656}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -762,60 +646,176 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 1992637979163270160}
-  m_OnClick:
+  m_TargetGraphic: {fileID: 6161522942202778277}
+  m_TextComponent: {fileID: 5378376240120746642}
+  m_Placeholder: {fileID: 8466805805671048750}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &3949984209549220817
-GameObject:
-  m_ObjectHideFlags: 0
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
+  m_ShouldActivateOnSelect: 1
+--- !u!1 &2529341275180177180
+GameObject:
+  m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5814578436793974781}
-  - component: {fileID: 4351359810594979135}
-  - component: {fileID: 7478871707517370066}
+  - component: {fileID: 5809815463446070544}
+  - component: {fileID: 3358727836237761043}
   m_Layer: 0
-  m_Name: Toggle
+  m_Name: InputVisualiser
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5809815463446070544
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2529341275180177180}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1510290506537729495}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &3358727836237761043
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2529341275180177180}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 029f906513940c040a4d8eeffa69ff41, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  VisibleTime: 1
+  Template: {fileID: 114304672768169282, guid: 5d369c3b330fa7447b709aee47e379f4, type: 3}
+  growthBound: 2
+  approachSpeed: 0.02
+--- !u!1 &2662721043924412788
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8358375899040149343}
+  - component: {fileID: 4801985420792007845}
+  - component: {fileID: 5928714902883965002}
+  - component: {fileID: 185481480942964287}
+  m_Layer: 0
+  m_Name: GameNameInputField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &5814578436793974781
+--- !u!224 &8358375899040149343
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3949984209549220817}
+  m_GameObject: {fileID: 2662721043924412788}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 229047808239693275}
-  - {fileID: 2486512690666058911}
-  m_Father: {fileID: 1418208516839357092}
-  m_RootOrder: 6
+  - {fileID: 3696253901750726199}
+  - {fileID: 1641534143240905910}
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 53.79}
-  m_SizeDelta: {x: 121.962006, y: 30}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -200}
+  m_SizeDelta: {x: 240, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &4351359810594979135
+--- !u!222 &4801985420792007845
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2662721043924412788}
+  m_CullTransparentMesh: 1
+--- !u!114 &5928714902883965002
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3949984209549220817}
+  m_GameObject: {fileID: 2662721043924412788}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &185481480942964287
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2662721043924412788}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -846,41 +846,35 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 2138399116387115889}
-  toggleTransition: 1
-  graphic: {fileID: 3006854312973386626}
-  m_Group: {fileID: 0}
-  onValueChanged:
+  m_TargetGraphic: {fileID: 5928714902883965002}
+  m_TextComponent: {fileID: 3520383502205934430}
+  m_Placeholder: {fileID: 1251523043746177562}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 1
---- !u!114 &7478871707517370066
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3949984209549220817}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!1 &4907374487998222203
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
+  m_ShouldActivateOnSelect: 1
+--- !u!1 &3187636917621324977
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -888,11 +882,11 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 698651906575015664}
-  - component: {fileID: 1042794929607626709}
-  - component: {fileID: 3575221825196674963}
-  - component: {fileID: 874081059201483681}
-  - component: {fileID: 4805810231936879587}
+  - component: {fileID: 658334975836887177}
+  - component: {fileID: 7176746108551974073}
+  - component: {fileID: 6185120661540278555}
+  - component: {fileID: 1175984317631128758}
+  - component: {fileID: 7154293199835554809}
   m_Layer: 0
   m_Name: AltDialog
   m_TagString: Untagged
@@ -900,21 +894,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &698651906575015664
+--- !u!224 &658334975836887177
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4907374487998222203}
+  m_GameObject: {fileID: 3187636917621324977}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1418208516839357092}
-  - {fileID: 5380647278834182067}
-  m_Father: {fileID: 5275682393695888382}
+  - {fileID: 2025872396341108583}
+  - {fileID: 3065318223923881068}
+  m_Father: {fileID: 173220801694919246}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -922,13 +916,13 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!223 &1042794929607626709
+--- !u!223 &7176746108551974073
 Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4907374487998222203}
+  m_GameObject: {fileID: 3187636917621324977}
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 0
@@ -939,17 +933,17 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
+  m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 32767
   m_TargetDisplay: 0
---- !u!114 &3575221825196674963
+--- !u!114 &6185120661540278555
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4907374487998222203}
+  m_GameObject: {fileID: 3187636917621324977}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@@ -966,13 +960,13 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
---- !u!114 &874081059201483681
+--- !u!114 &1175984317631128758
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4907374487998222203}
+  m_GameObject: {fileID: 3187636917621324977}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@@ -983,28 +977,29 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
---- !u!114 &4805810231936879587
+--- !u!114 &7154293199835554809
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4907374487998222203}
+  m_GameObject: {fileID: 3187636917621324977}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 325c72dd5e578034a80d253437df2106, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Dialog: {fileID: 1355087064177554034}
-  TitleText: {fileID: 8968025562674945957}
-  MessageText: {fileID: 8909593898213454557}
-  CloseButton: {fileID: 5177926431652716687}
-  Icon: {fileID: 3331856202505806619}
-  PortLabel: {fileID: 4306371274370695992}
-  PortInputField: {fileID: 2512445088334003303}
-  RestartButton: {fileID: 7375846880575371418}
+  Dialog: {fileID: 324886965155536395}
+  TitleText: {fileID: 503032742267609750}
+  MessageText: {fileID: 4825339984740297780}
+  CloseButton: {fileID: 8333555455189455926}
+  Icon: {fileID: 7203053245468445205}
+  HostInputField: {fileID: 7127813294200200465}
+  PortInputField: {fileID: 2151151441147216545}
+  GameNameInputField: {fileID: 185481480942964287}
+  RestartButton: {fileID: 3522253570947247987}
   CustomInputToggle: {fileID: 0}
---- !u!1 &5824270978959358963
+--- !u!1 &3421404118541810477
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1012,52 +1007,120 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3828606823447823428}
-  - component: {fileID: 5737265885749298255}
+  - component: {fileID: 1631572687043238285}
+  - component: {fileID: 1249825812997235617}
+  - component: {fileID: 5500003448990608009}
+  - component: {fileID: 8333555455189455926}
   m_Layer: 0
-  m_Name: InputVisualiser
+  m_Name: CloseButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3828606823447823428
+--- !u!224 &1631572687043238285
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5824270978959358963}
+  m_GameObject: {fileID: 3421404118541810477}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8600116890753262349}
-  m_RootOrder: 0
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &5737265885749298255
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -15, y: -15}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &1249825812997235617
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3421404118541810477}
+  m_CullTransparentMesh: 1
+--- !u!114 &5500003448990608009
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5824270978959358963}
+  m_GameObject: {fileID: 3421404118541810477}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 029f906513940c040a4d8eeffa69ff41, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  VisibleTime: 1
-  Template: {fileID: 114304672768169282, guid: 5d369c3b330fa7447b709aee47e379f4, type: 3}
-  growthBound: 2
-  approachSpeed: 0.02
---- !u!1 &6071951859356439711
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 903bb101d290e67469548feecf3b0ba2, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8333555455189455926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3421404118541810477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5500003448990608009}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3597799392687258365
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1065,155 +1128,55 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8600116890753262349}
-  - component: {fileID: 7451158525505906476}
-  - component: {fileID: 5477024860622448785}
-  - component: {fileID: 4825035819710904758}
+  - component: {fileID: 7628076110600710741}
+  - component: {fileID: 8491495613534354576}
+  - component: {fileID: 4873371298024789571}
   m_Layer: 0
-  m_Name: CanvasInputVisualiser
+  m_Name: Background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8600116890753262349
+--- !u!224 &7628076110600710741
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6071951859356439711}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 3597799392687258365}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3828606823447823428}
-  m_Father: {fileID: 5275682393695888382}
+  - {fileID: 6726453180809659489}
+  m_Father: {fileID: 7431593989707602052}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!223 &7451158525505906476
-Canvas:
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10, y: -12.5}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8491495613534354576
+CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6071951859356439711}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 32767
-  m_TargetDisplay: 0
---- !u!114 &5477024860622448785
+  m_GameObject: {fileID: 3597799392687258365}
+  m_CullTransparentMesh: 1
+--- !u!114 &4873371298024789571
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6071951859356439711}
+  m_GameObject: {fileID: 3597799392687258365}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!114 &4825035819710904758
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6071951859356439711}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!1 &6382633583099661617
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1060224340188328378}
-  - component: {fileID: 5632010200298646593}
-  - component: {fileID: 4306371274370695992}
-  m_Layer: 0
-  m_Name: PortLabel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1060224340188328378
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6382633583099661617}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1418208516839357092}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -20}
-  m_SizeDelta: {x: 400, y: 75}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5632010200298646593
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6382633583099661617}
-  m_CullTransparentMesh: 1
---- !u!114 &4306371274370695992
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6382633583099661617}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1224,21 +1187,17 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: To change the port number input a new port and press the Restart button.
---- !u!1 &6801194715716961927
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4147009857528548610
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1246,58 +1205,58 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 826954983450758049}
-  - component: {fileID: 6552585579368363770}
-  - component: {fileID: 5682891835195880762}
+  - component: {fileID: 5734767344113412670}
+  - component: {fileID: 4586268056826255572}
+  - component: {fileID: 4884182143523760533}
   m_Layer: 0
-  m_Name: Text
+  m_Name: Placeholder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &826954983450758049
+--- !u!224 &5734767344113412670
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6801194715716961927}
+  m_GameObject: {fileID: 4147009857528548610}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6637697637156526189}
-  m_RootOrder: 0
+  m_Father: {fileID: 4669032243788926043}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6552585579368363770
+--- !u!222 &4586268056826255572
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6801194715716961927}
+  m_GameObject: {fileID: 4147009857528548610}
   m_CullTransparentMesh: 1
---- !u!114 &5682891835195880762
+--- !u!114 &4884182143523760533
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6801194715716961927}
+  m_GameObject: {fileID: 4147009857528548610}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1314,11 +1273,11 @@ MonoBehaviour:
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 0
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 
---- !u!1 &7155360372610505065
+  m_Text: Enter host...
+--- !u!1 &4714964912545169319
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1326,10 +1285,10 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5275682393695888382}
-  - component: {fileID: 8384657545137329710}
-  - component: {fileID: 8292478362866719213}
-  - component: {fileID: 2327866330221070553}
+  - component: {fileID: 173220801694919246}
+  - component: {fileID: 8556826037364914374}
+  - component: {fileID: 5771343995894601503}
+  - component: {fileID: 5100543633707381182}
   m_Layer: 0
   m_Name: AltTesterPrefab
   m_TagString: Untagged
@@ -1337,30 +1296,30 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5275682393695888382
+--- !u!4 &173220801694919246
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7155360372610505065}
+  m_GameObject: {fileID: 4714964912545169319}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8600116890753262349}
-  - {fileID: 698651906575015664}
+  - {fileID: 1510290506537729495}
+  - {fileID: 658334975836887177}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8384657545137329710
+--- !u!114 &8556826037364914374
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7155360372610505065}
+  m_GameObject: {fileID: 4714964912545169319}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d64f576b163a84c53be56deef13c731f, type: 3}
@@ -1370,39 +1329,39 @@ MonoBehaviour:
     InstrumentationMode: 0
     ProxyHost: 127.0.0.1
     ProxyPort: 13000
-    AltTesterPort: 13000
+    GameName: __default__
     InputVisualizer: 1
     ShowPopUp: 1
   RunOnlyInDebugMode: 1
   outlineShader: {fileID: 4800000, guid: 37d07aac6f4b1dc48924e98e1e398261, type: 3}
   panelHightlightPrefab: {fileID: 1422609480502334, guid: c2c3ede7bbf3b184c9c6d7cc4cf5cad3,
     type: 3}
-  InputsVisualizer: {fileID: 5737265885749298255}
---- !u!114 &8292478362866719213
+  InputsVisualizer: {fileID: 3358727836237761043}
+--- !u!114 &5771343995894601503
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7155360372610505065}
+  m_GameObject: {fileID: 4714964912545169319}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d624c3e46e0f6e149b2b2a3ce225decd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2327866330221070553
+--- !u!114 &5100543633707381182
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7155360372610505065}
+  m_GameObject: {fileID: 4714964912545169319}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 14a59e5c699bb6443adf60af1a0deb56, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &7789449010589301247
+--- !u!1 &5019998078032498143
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1410,52 +1369,51 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2486512690666058911}
-  - component: {fileID: 1831452600483433532}
-  - component: {fileID: 7393373835616442452}
-  - component: {fileID: 6203818659113144308}
+  - component: {fileID: 7107267703016578963}
+  - component: {fileID: 8664398660317589953}
+  - component: {fileID: 503032742267609750}
   m_Layer: 0
-  m_Name: Label
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2486512690666058911
+--- !u!224 &7107267703016578963
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7789449010589301247}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_GameObject: {fileID: 5019998078032498143}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5814578436793974781}
-  m_RootOrder: 1
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1831452600483433532
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -31}
+  m_SizeDelta: {x: 300, y: 75}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8664398660317589953
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7789449010589301247}
+  m_GameObject: {fileID: 5019998078032498143}
   m_CullTransparentMesh: 1
---- !u!114 &7393373835616442452
+--- !u!114 &503032742267609750
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7789449010589301247}
+  m_GameObject: {fileID: 5019998078032498143}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@@ -1471,39 +1429,19 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
+    m_FontSize: 30
     m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 1
+    m_BestFit: 0
+    m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Custom Input
---- !u!114 &6203818659113144308
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7789449010589301247}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: 100
-  m_FlexibleHeight: 100
-  m_LayoutPriority: 1
---- !u!1 &7796198091456802113
+  m_Text: AltTester v.1.8.1
+--- !u!1 &5387652802862418749
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1511,58 +1449,58 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 874416383060627722}
-  - component: {fileID: 3137425518567135671}
-  - component: {fileID: 9161107025547903138}
+  - component: {fileID: 6224684989620782974}
+  - component: {fileID: 4749251222910425264}
+  - component: {fileID: 6357586543897343305}
   m_Layer: 0
-  m_Name: Placeholder
+  m_Name: Label
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &874416383060627722
+--- !u!224 &6224684989620782974
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7796198091456802113}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 5387652802862418749}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6637697637156526189}
+  m_Father: {fileID: 7431593989707602052}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.5}
-  m_SizeDelta: {x: -20, y: -13}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 91.67, y: -12.5}
+  m_SizeDelta: {x: 130.34, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3137425518567135671
+--- !u!222 &4749251222910425264
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7796198091456802113}
+  m_GameObject: {fileID: 5387652802862418749}
   m_CullTransparentMesh: 1
---- !u!114 &9161107025547903138
+--- !u!114 &6357586543897343305
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7796198091456802113}
+  m_GameObject: {fileID: 5387652802862418749}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1574,16 +1512,16 @@ MonoBehaviour:
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
-    m_RichText: 0
+    m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Enter port number...
---- !u!1 &7946895966008715779
+  m_Text: Custom Input
+--- !u!1 &5670158775600214001
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1591,133 +1529,79 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5380647278834182067}
-  - component: {fileID: 1307255400125616809}
-  - component: {fileID: 3331856202505806619}
-  - component: {fileID: 139754847837269830}
-  - component: {fileID: 7749633827072155193}
+  - component: {fileID: 7873647941765999930}
+  - component: {fileID: 7067582757512985542}
+  - component: {fileID: 5276819046113372566}
   m_Layer: 0
-  m_Name: Icon
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &5380647278834182067
+--- !u!224 &7873647941765999930
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7946895966008715779}
+  m_GameObject: {fileID: 5670158775600214001}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 698651906575015664}
-  m_RootOrder: 1
+  m_Father: {fileID: 4669032243788926043}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 1, y: 0}
---- !u!222 &1307255400125616809
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7067582757512985542
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7946895966008715779}
+  m_GameObject: {fileID: 5670158775600214001}
   m_CullTransparentMesh: 1
---- !u!114 &3331856202505806619
+--- !u!114 &5276819046113372566
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7946895966008715779}
+  m_GameObject: {fileID: 5670158775600214001}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 0f1a80f61f5b88b4e936cd2851440318, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &139754847837269830
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7946895966008715779}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 3331856202505806619}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &7749633827072155193
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7946895966008715779}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4a4cdcb385f2cce45936ea93e75583bd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &8009170797761655649
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!1 &6272654194735766864
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1725,52 +1609,154 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6030122892160139382}
-  - component: {fileID: 1585282491852091228}
-  - component: {fileID: 6529485251431752872}
-  - component: {fileID: 5177926431652716687}
+  - component: {fileID: 1510290506537729495}
+  - component: {fileID: 1000099649815556580}
+  - component: {fileID: 1655733824985867241}
+  - component: {fileID: 3859434358828781789}
   m_Layer: 0
-  m_Name: CloseButton
+  m_Name: CanvasInputVisualiser
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6030122892160139382
+--- !u!224 &1510290506537729495
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8009170797761655649}
+  m_GameObject: {fileID: 6272654194735766864}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1418208516839357092}
-  m_RootOrder: 5
+  m_Children:
+  - {fileID: 5809815463446070544}
+  m_Father: {fileID: 173220801694919246}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -15, y: -15}
-  m_SizeDelta: {x: 16, y: 16}
-  m_Pivot: {x: 1, y: 1}
---- !u!222 &1585282491852091228
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &1000099649815556580
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6272654194735766864}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 32767
+  m_TargetDisplay: 0
+--- !u!114 &1655733824985867241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6272654194735766864}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &3859434358828781789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6272654194735766864}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &6730979341163725130
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3065318223923881068}
+  - component: {fileID: 4048050038387764}
+  - component: {fileID: 7203053245468445205}
+  - component: {fileID: 1814693233391153508}
+  - component: {fileID: 4658192954332585068}
+  m_Layer: 0
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3065318223923881068
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730979341163725130}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 658334975836887177}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &4048050038387764
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8009170797761655649}
+  m_GameObject: {fileID: 6730979341163725130}
   m_CullTransparentMesh: 1
---- !u!114 &6529485251431752872
+--- !u!114 &7203053245468445205
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8009170797761655649}
+  m_GameObject: {fileID: 6730979341163725130}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -1784,7 +1770,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 903bb101d290e67469548feecf3b0ba2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0f1a80f61f5b88b4e936cd2851440318, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1794,13 +1780,13 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &5177926431652716687
+--- !u!114 &1814693233391153508
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8009170797761655649}
+  m_GameObject: {fileID: 6730979341163725130}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -1834,7 +1820,570 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 6529485251431752872}
+  m_TargetGraphic: {fileID: 7203053245468445205}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4658192954332585068
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730979341163725130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4a4cdcb385f2cce45936ea93e75583bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &6779293336583647281
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6726453180809659489}
+  - component: {fileID: 7026673336247732754}
+  - component: {fileID: 810750720975947705}
+  m_Layer: 0
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6726453180809659489
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779293336583647281}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7628076110600710741}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7026673336247732754
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779293336583647281}
+  m_CullTransparentMesh: 1
+--- !u!114 &810750720975947705
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6779293336583647281}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6948598989677981382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4669032243788926043}
+  - component: {fileID: 2058397410474277379}
+  - component: {fileID: 7228561239025916512}
+  - component: {fileID: 7127813294200200465}
+  m_Layer: 0
+  m_Name: HostInputField
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4669032243788926043
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6948598989677981382}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7873647941765999930}
+  - {fileID: 5734767344113412670}
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -110}
+  m_SizeDelta: {x: 240, y: 34}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2058397410474277379
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6948598989677981382}
+  m_CullTransparentMesh: 1
+--- !u!114 &7228561239025916512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6948598989677981382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7127813294200200465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6948598989677981382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7228561239025916512}
+  m_TextComponent: {fileID: 5276819046113372566}
+  m_Placeholder: {fileID: 4884182143523760533}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnSubmit:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
+  m_ShouldActivateOnSelect: 1
+--- !u!1 &7449859013363986110
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8700682341986467457}
+  - component: {fileID: 1709790747665875319}
+  - component: {fileID: 5378376240120746642}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8700682341986467457
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449859013363986110}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5574091098227206381}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1709790747665875319
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449859013363986110}
+  m_CullTransparentMesh: 1
+--- !u!114 &5378376240120746642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449859013363986110}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!1 &7628953192241417809
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7431593989707602052}
+  - component: {fileID: 7915727824065972264}
+  m_Layer: 0
+  m_Name: Toggle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7431593989707602052
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7628953192241417809}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7628076110600710741}
+  - {fileID: 6224684989620782974}
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 17.919598, y: -280}
+  m_SizeDelta: {x: 156.8393, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7915727824065972264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7628953192241417809}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4873371298024789571}
+  toggleTransition: 1
+  graphic: {fileID: 810750720975947705}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 1
+--- !u!1 &8223567025381775458
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3696253901750726199}
+  - component: {fileID: 20204378151809956}
+  - component: {fileID: 3520383502205934430}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3696253901750726199
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8223567025381775458}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8358375899040149343}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &20204378151809956
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8223567025381775458}
+  m_CullTransparentMesh: 1
+--- !u!114 &3520383502205934430
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8223567025381775458}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!1 &8568460595404759499
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8641514271335108404}
+  - component: {fileID: 5511321733140059031}
+  - component: {fileID: 1392227924623515354}
+  m_Layer: 0
+  m_Name: InfoLabel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8641514271335108404
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8568460595404759499}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2025872396341108583}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -50}
+  m_SizeDelta: {x: 400, y: 75}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5511321733140059031
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8568460595404759499}
+  m_CullTransparentMesh: 1
+--- !u!114 &1392227924623515354
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8568460595404759499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: To change the host, port or game name input a new value and press the Restart
+    button.
diff --git a/Assets/Editor/BuildAltTester.cs b/Assets/Editor/BuildAltTester.cs
index be0d12275..88760ea22 100644
--- a/Assets/Editor/BuildAltTester.cs
+++ b/Assets/Editor/BuildAltTester.cs
@@ -1,10 +1,10 @@
 using System;
-using Altom.AltTester;
-using Altom.AltTesterEditor;
-using Altom.AltTesterEditor.Logging;
+using AltTesterEditor;
+using AltTester;
+using AltTesterEditor.Logging;
 using UnityEditor;
 
-namespace Altom.AltTesterTools
+namespace AltTesterTools
 {
     public class BuildAltTester
     {
@@ -270,13 +270,14 @@ protected static void WebGLBuildFromCommandLine()
                 };
 
                 AltBuilder.AddAltTesterInScriptingDefineSymbolsGroup(BuildTargetGroup.WebGL);
-
+                AltBuilder.AddScriptingDefineSymbol("UNITY_WEBGL", BuildTargetGroup.WebGL);
 
                 var instrumentationSettings = getInstrumentationSettings();
                 AltBuilder.InsertAltInScene(buildPlayerOptions.scenes[0], instrumentationSettings);
 
                 var results = BuildPipeline.BuildPlayer(buildPlayerOptions);
                 AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(BuildTargetGroup.WebGL);
+                AltBuilder.RemoveScriptingDefineSymbol("UNITY_WEBGL", BuildTargetGroup.WebGL);
 
 
 #if UNITY_2017
@@ -318,35 +319,28 @@ protected static void WebGLBuildFromCommandLine()
 
         private static AltInstrumentationSettings getInstrumentationSettings()
         {
-            if (AltTesterEditorWindow.EditorConfiguration == null)
-            {
-                var instrumentationSettings = new AltInstrumentationSettings();
-                var altTesterPort = System.Environment.GetEnvironmentVariable("ALTTESTER_PORT");
-
-                if (!string.IsNullOrEmpty(altTesterPort)) //server mode
-                {
-                    instrumentationSettings.AltTesterPort = int.Parse(altTesterPort);
-                    return instrumentationSettings;
-                }
 
-                var proxyHost = System.Environment.GetEnvironmentVariable("PROXY_HOST");
+            var instrumentationSettings = new AltInstrumentationSettings();
+            var proxyHost = System.Environment.GetEnvironmentVariable("PROXY_HOST");
+            if (!string.IsNullOrEmpty(proxyHost)) //proxy mode
+            {
+                instrumentationSettings.InstrumentationMode = AltInstrumentationMode.Proxy;
+                instrumentationSettings.ProxyHost = proxyHost;
+            }
+            var proxyPort = System.Environment.GetEnvironmentVariable("PROXY_PORT");
+            if (!string.IsNullOrEmpty(proxyPort))//proxy mode
+            {
+                instrumentationSettings.InstrumentationMode = AltInstrumentationMode.Proxy;
+                instrumentationSettings.ProxyPort = int.Parse(proxyPort);
+            }
+            else
+            {
+                instrumentationSettings.ProxyPort = 13010;
+            }
 
-                if (!string.IsNullOrEmpty(proxyHost)) //proxy mode
-                {
-                    instrumentationSettings.InstrumentationMode = AltInstrumentationMode.Proxy;
-                    instrumentationSettings.ProxyHost = proxyHost;
-                }
-                var proxyPort = System.Environment.GetEnvironmentVariable("PROXY_PORT");
-                if (!string.IsNullOrEmpty(proxyPort))//proxy mode
-                {
-                    instrumentationSettings.InstrumentationMode = AltInstrumentationMode.Proxy;
-                    instrumentationSettings.ProxyPort = int.Parse(proxyPort);
-                }
+            return instrumentationSettings;
 
-                return instrumentationSettings;
-            }
 
-            return AltTesterEditorWindow.EditorConfiguration.GetInstrumentationSettings();
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Editor/CreateAltPrefab.cs b/Assets/Editor/CreateAltPrefab.cs
index 97052d9fb..086719429 100644
--- a/Assets/Editor/CreateAltPrefab.cs
+++ b/Assets/Editor/CreateAltPrefab.cs
@@ -1,14 +1,14 @@
-﻿using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Altom.AltTester;
-using Altom.AltTester.UI;
+using AltTester;
+using AltTester.UI;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Altom.AltTesterTools
+namespace AltTesterTools
 {
     public class CreateAltPrefab : MonoBehaviour
     {
@@ -111,7 +111,7 @@ public static void CreateAUTPrefab()
             DialogTransform.anchorMin = new Vector2(0.5f, 0.5f);
             DialogTransform.anchorMax = new Vector2(0.5f, 0.5f);
             DialogTransform.pivot = new Vector2(0.5f, 0.5f);
-            DialogTransform.sizeDelta = new Vector2(440, 440);
+            DialogTransform.sizeDelta = new Vector2(440, 600);
             DialogTransform.localPosition = new Vector3(0, 0, 0);
 
             var DialogImage = DialogGameObject.GetComponent<Image>();
@@ -144,10 +144,10 @@ public static void CreateAUTPrefab()
             var MessageRectTransform = MessageGameObject.GetComponent<RectTransform>();
             MessageRectTransform.SetParent(DialogTransform, false);
 
-            MessageRectTransform.localPosition = new Vector3(0, 60, 0);
+            MessageRectTransform.localPosition = new Vector3(0, 100, 0);
             MessageRectTransform.anchorMin = new Vector2(0.5f, 0.5f);
             MessageRectTransform.anchorMax = new Vector2(0.5f, 0.5f);
-            MessageRectTransform.sizeDelta = new Vector2(400, 100);
+            MessageRectTransform.sizeDelta = new Vector2(400, 120);
             MessageRectTransform.pivot = new Vector2(0.5f, 0.5f);
 
             var MessageText = MessageGameObject.GetComponent<Text>();
@@ -156,29 +156,75 @@ public static void CreateAUTPrefab()
             MessageText.color = Color.white;
             MessageText.alignment = TextAnchor.MiddleCenter;
 
-            // Create Port Label
-            var PortLabel = new GameObject("PortLabel", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
-            var PortLabelRectTransform = PortLabel.GetComponent<RectTransform>();
-            PortLabelRectTransform.SetParent(DialogTransform, false);
-
-            PortLabelRectTransform.localPosition = new Vector3(0, -50, 0);
-            PortLabelRectTransform.anchorMin = new Vector2(0.5f, 0.5f);
-            PortLabelRectTransform.anchorMax = new Vector2(0.5f, 0.5f);
-            PortLabelRectTransform.sizeDelta = new Vector2(400, 75);
-            PortLabelRectTransform.pivot = new Vector2(0.5f, 0.5f);
-
-            var PortLabelText = PortLabel.GetComponent<Text>();
-            PortLabelText.text = "To change the port number input a new port and press the Restart button.";
-            PortLabelText.fontSize = 20;
-            PortLabelText.color = Color.white;
-            PortLabelText.alignment = TextAnchor.MiddleCenter;
+            // Create Info Label
+            var InfoLabel = new GameObject("InfoLabel", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
+            var InfoLabelRectTransform = InfoLabel.GetComponent<RectTransform>();
+            InfoLabelRectTransform.SetParent(DialogTransform, false);
+
+            InfoLabelRectTransform.localPosition = new Vector3(0, -50, 0);
+            InfoLabelRectTransform.anchorMin = new Vector2(0.5f, 0.5f);
+            InfoLabelRectTransform.anchorMax = new Vector2(0.5f, 0.5f);
+            InfoLabelRectTransform.sizeDelta = new Vector2(400, 75);
+            InfoLabelRectTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var InfoLabelText = InfoLabel.GetComponent<Text>();
+            InfoLabelText.text = "To change the host, port or game name input a new value and press the Restart button.";
+            InfoLabelText.fontSize = 20;
+            InfoLabelText.color = Color.white;
+            InfoLabelText.alignment = TextAnchor.MiddleCenter;
+
+            // Create Host Input Field
+            var HostInputFieldGameObject = new GameObject("HostInputField", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(InputField) });
+            var HostInputFieldTransform = HostInputFieldGameObject.GetComponent<RectTransform>();
+            HostInputFieldTransform.SetParent(DialogTransform, false);
+
+            HostInputFieldTransform.localPosition = new Vector3(0, -110, 0);
+            HostInputFieldTransform.anchorMin = new Vector2(0.5f, 0.5f);
+            HostInputFieldTransform.anchorMax = new Vector2(0.5f, 0.5f);
+            HostInputFieldTransform.sizeDelta = new Vector2(240, 34);
+            HostInputFieldTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var HostInputFieldTextGameObject = new GameObject("Text", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
+            var HostInputFieldTextTransform = HostInputFieldTextGameObject.GetComponent<RectTransform>();
+            HostInputFieldTextTransform.SetParent(HostInputFieldTransform, false);
+
+            HostInputFieldTextTransform.localPosition = new Vector3(0, -0.5f, 0);
+            HostInputFieldTextTransform.sizeDelta = new Vector2(-20, -13);
+            HostInputFieldTextTransform.anchorMin = new Vector2(0, 0);
+            HostInputFieldTextTransform.anchorMax = new Vector2(1, 1);
+            HostInputFieldTextTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var HostInputFieldText = HostInputFieldTextGameObject.GetComponent<Text>();
+            HostInputFieldText.supportRichText = false;
+            HostInputFieldText.fontSize = 18;
+            HostInputFieldText.color = Color.black;
+
+            var HostInputFieldPlaceholderGameObject = new GameObject("Placeholder", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
+            var HostInputFieldPlaceholderTransform = HostInputFieldPlaceholderGameObject.GetComponent<RectTransform>();
+            HostInputFieldPlaceholderTransform.SetParent(HostInputFieldTransform, false);
+
+            HostInputFieldPlaceholderTransform.localPosition = new Vector3(0, -0.5f, 0);
+            HostInputFieldPlaceholderTransform.sizeDelta = new Vector2(-20, -13);
+            HostInputFieldPlaceholderTransform.anchorMin = new Vector2(0, 0);
+            HostInputFieldPlaceholderTransform.anchorMax = new Vector2(1, 1);
+            HostInputFieldPlaceholderTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var HostInputFieldPlaceholder = HostInputFieldPlaceholderGameObject.GetComponent<Text>();
+            HostInputFieldPlaceholder.supportRichText = false;
+            HostInputFieldPlaceholder.fontSize = 18;
+            HostInputFieldPlaceholder.text = "Enter host...";
+            HostInputFieldPlaceholder.color = Color.gray;
+
+            var HostInputField = HostInputFieldGameObject.GetComponent<InputField>();
+            HostInputField.textComponent = HostInputFieldText;
+            HostInputField.placeholder = HostInputFieldPlaceholder;
 
             // Create Port Input Field
             var PortInputFieldGameObject = new GameObject("PortInputField", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(InputField) });
             var PortInputFieldTransform = PortInputFieldGameObject.GetComponent<RectTransform>();
             PortInputFieldTransform.SetParent(DialogTransform, false);
 
-            PortInputFieldTransform.localPosition = new Vector3(0, -110, 0);
+            PortInputFieldTransform.localPosition = new Vector3(0, -155, 0);
             PortInputFieldTransform.anchorMin = new Vector2(0.5f, 0.5f);
             PortInputFieldTransform.anchorMax = new Vector2(0.5f, 0.5f);
             PortInputFieldTransform.sizeDelta = new Vector2(240, 34);
@@ -219,12 +265,58 @@ public static void CreateAUTPrefab()
             PortInputField.textComponent = PortInputFieldText;
             PortInputField.placeholder = PortInputFieldPlaceholder;
 
+            // Create Game Name Input Field
+            var GameNameInputFieldGameObject = new GameObject("GameNameInputField", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(InputField) });
+            var GameNameInputFieldTransform = GameNameInputFieldGameObject.GetComponent<RectTransform>();
+            GameNameInputFieldTransform.SetParent(DialogTransform, false);
+
+            GameNameInputFieldTransform.localPosition = new Vector3(0, -200, 0);
+            GameNameInputFieldTransform.anchorMin = new Vector2(0.5f, 0.5f);
+            GameNameInputFieldTransform.anchorMax = new Vector2(0.5f, 0.5f);
+            GameNameInputFieldTransform.sizeDelta = new Vector2(240, 34);
+            GameNameInputFieldTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var GameNameInputFieldTextGameObject = new GameObject("Text", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
+            var GameNameInputFieldTextTransform = GameNameInputFieldTextGameObject.GetComponent<RectTransform>();
+            GameNameInputFieldTextTransform.SetParent(GameNameInputFieldTransform, false);
+
+            GameNameInputFieldTextTransform.localPosition = new Vector3(0, -0.5f, 0);
+            GameNameInputFieldTextTransform.sizeDelta = new Vector2(-20, -13);
+            GameNameInputFieldTextTransform.anchorMin = new Vector2(0, 0);
+            GameNameInputFieldTextTransform.anchorMax = new Vector2(1, 1);
+            GameNameInputFieldTextTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var GameNameInputFieldText = GameNameInputFieldTextGameObject.GetComponent<Text>();
+            GameNameInputFieldText.supportRichText = false;
+            GameNameInputFieldText.fontSize = 18;
+            GameNameInputFieldText.color = Color.black;
+
+            var GameNameInputFieldPlaceholderGameObject = new GameObject("Placeholder", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
+            var GameNameInputFieldPlaceholderTransform = GameNameInputFieldPlaceholderGameObject.GetComponent<RectTransform>();
+            GameNameInputFieldPlaceholderTransform.SetParent(GameNameInputFieldTransform, false);
+
+            GameNameInputFieldPlaceholderTransform.localPosition = new Vector3(0, -0.5f, 0);
+            GameNameInputFieldPlaceholderTransform.sizeDelta = new Vector2(-20, -13);
+            GameNameInputFieldPlaceholderTransform.anchorMin = new Vector2(0, 0);
+            GameNameInputFieldPlaceholderTransform.anchorMax = new Vector2(1, 1);
+            GameNameInputFieldPlaceholderTransform.pivot = new Vector2(0.5f, 0.5f);
+
+            var GameNameInputFieldPlaceholder = GameNameInputFieldPlaceholderGameObject.GetComponent<Text>();
+            GameNameInputFieldPlaceholder.supportRichText = false;
+            GameNameInputFieldPlaceholder.fontSize = 18;
+            GameNameInputFieldPlaceholder.text = "Enter game name...";
+            GameNameInputFieldPlaceholder.color = Color.gray;
+
+            var GameNameInputField = GameNameInputFieldGameObject.GetComponent<InputField>();
+            GameNameInputField.textComponent = GameNameInputFieldText;
+            GameNameInputField.placeholder = GameNameInputFieldPlaceholder;
+
             // Create Restart Button
             var RestartButtonGameObject = new GameObject("RestartButton", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(Button) });
             var RestartButtonRectTransform = RestartButtonGameObject.GetComponent<RectTransform>();
             RestartButtonRectTransform.SetParent(DialogTransform, false);
 
-            RestartButtonRectTransform.localPosition = new Vector3(0, -155, 0);
+            RestartButtonRectTransform.localPosition = new Vector3(0, -245, 0);
             RestartButtonRectTransform.anchorMin = new Vector2(0.5f, 0.5f);
             RestartButtonRectTransform.anchorMax = new Vector2(0.5f, 0.5f);
             RestartButtonRectTransform.sizeDelta = new Vector2(240, 34);
@@ -248,6 +340,47 @@ public static void CreateAUTPrefab()
 
             var RestartButton = RestartButtonGameObject.GetComponent<Button>();
 
+            //Create CustomToggle
+
+            var Toggle = new GameObject("Toggle", new System.Type[] { typeof(RectTransform), typeof(Toggle) });
+            var ToggleRectTransform = Toggle.GetComponent<RectTransform>();
+            ToggleRectTransform.SetParent(DialogTransform, false);
+            ToggleRectTransform.localPosition = new Vector3(-15, -15, 0);
+            ToggleRectTransform.anchorMin = new Vector2(1f, 1f);
+            ToggleRectTransform.anchorMax = new Vector2(1f, 1f);
+            ToggleRectTransform.sizeDelta = new Vector2(130.34f, 25);
+            ToggleRectTransform.pivot = new Vector2(1f, 1f);
+
+            var Background = new GameObject("Background", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image) });
+            var BackgroundTransform = Background.GetComponent<RectTransform>();
+            BackgroundTransform.SetParent(DialogTransform, false);
+            BackgroundTransform.localPosition = new Vector3(-68, 0, 0);
+            BackgroundTransform.anchorMin = new Vector2(0f, 1f);
+            BackgroundTransform.anchorMax = new Vector2(0f, 1f);
+            BackgroundTransform.sizeDelta = new Vector2(20f, 20f);
+            BackgroundTransform.pivot = new Vector2(0.5f, 0.5f);
+            var Checkmark = new GameObject("Checkmark", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image) });
+            var CheckMarkTransform = Checkmark.GetComponent<RectTransform>();
+            CheckMarkTransform.SetParent(DialogTransform, false);
+            CheckMarkTransform.localPosition = new Vector3(0, 0, 0);
+            CheckMarkTransform.anchorMin = new Vector2(0.5f, 0.5f);
+            CheckMarkTransform.anchorMax = new Vector2(0.5f, 0.5f);
+            CheckMarkTransform.sizeDelta = new Vector2(20f, 20f);
+            CheckMarkTransform.pivot = new Vector2(0.5f, 0.5f);
+            var Label = new GameObject("Label", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Text) });
+            var LabelTransform = Label.GetComponent<RectTransform>();
+            LabelTransform.SetParent(DialogTransform, false);
+            LabelTransform.localPosition = new Vector3(13.25f, 0, 0);
+            LabelTransform.anchorMin = new Vector2(0f, 1f);
+            LabelTransform.anchorMax = new Vector2(0f, 1f);
+            LabelTransform.sizeDelta = new Vector2(130f, 25f);
+            LabelTransform.pivot = new Vector2(0.5f, 0.5f);
+            var LabelText = Label.GetComponent<Text>();
+            LabelText.text = "Custom input";
+            LabelText.fontSize = 18;
+            LabelText.alignment = TextAnchor.MiddleLeft;
+
+
             // Create CloseButton
             var CloseButtonGameObject = new GameObject("CloseButton", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(Button) });
             var CloseButtonRectTransform = CloseButtonGameObject.GetComponent<RectTransform>();
@@ -264,7 +397,6 @@ public static void CreateAUTPrefab()
             CloseButtonImage.SetNativeSize();
             var CloseButton = CloseButtonGameObject.GetComponent<Button>();
 
-
             // Create Icon
             var Icon = new GameObject("Icon", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(Button), typeof(AltPrefabDrag) });
             var IconRectTransform = Icon.GetComponent<RectTransform>();
@@ -289,15 +421,15 @@ public static void CreateAUTPrefab()
             Altrunner.RunOnlyInDebugMode = true;
             Altrunner.InputsVisualizer = AltInputsVisualiser;
 
-
-            // Set AltDialog variables
+            // Set AltTesterDialog variables
             AltDialog.Dialog = DialogGameObject;
             AltDialog.TitleText = TitleText;
             AltDialog.MessageText = MessageText;
             AltDialog.CloseButton = CloseButton;
             AltDialog.Icon = IconImage;
-            AltDialog.PortLabel = PortLabelText;
+            AltDialog.HostInputField = HostInputField;
             AltDialog.PortInputField = PortInputField;
+            AltDialog.GameNameInputField = GameNameInputField;
             AltDialog.RestartButton = RestartButton;
 
             var testPath = "Assets/Editor/AltRunnerPrefab.prefab";
@@ -390,6 +522,7 @@ private static void checkObjectEquality(GameObject originalObject, GameObject ne
                 checkObjectEquality(originalObject.transform.GetChild(i).gameObject, newObject.transform.GetChild(i).gameObject);
             }
         }
+
         private static void checkTranformEquality(RectTransform originalTransform, RectTransform newTransform)
         {
             if (!vector3Equality(originalTransform.position, newTransform.position))
@@ -425,6 +558,7 @@ private static void checkTranformEquality(RectTransform originalTransform, RectT
                 throw new System.Exception("RectTransform localRotation for: " + originalTransform.gameObject + " is different. Original: " + originalTransform.localRotation + " and new: " + newTransform.localRotation);
             }
         }
+
         private static void checkImageEquality(Image originalImage, Image newImage)
         {
             if (originalImage.sprite != newImage.sprite)
@@ -440,6 +574,7 @@ private static void checkImageEquality(Image originalImage, Image newImage)
                 throw new System.Exception("Image fillMethod for: " + originalImage.gameObject + " is different. Original: " + originalImage.fillMethod + " and new: " + originalImage.fillMethod);
             }
         }
+
         private static void checkCanvasEquality(Canvas originalCanvas, Canvas newCanvas)
         {
             if (originalCanvas.sortingOrder != newCanvas.sortingOrder)
@@ -508,14 +643,17 @@ private static void checkaltRunnerEquality(AltRunner originalRunner, AltRunner n
                 throw new System.Exception("RunOnlyInDebugMode object for: " + originalRunner.gameObject + " is different. Original: " + originalRunner.RunOnlyInDebugMode + " and new: " + newRunner.RunOnlyInDebugMode);
             }
         }
+
         private static bool vector3Equality(Vector3 originalVector3, Vector3 newVector3)
         {
             return FloatApproximation(originalVector3.x, newVector3.x, 0.01f) && FloatApproximation(originalVector3.y, newVector3.y, 0.01f) && FloatApproximation(originalVector3.z, newVector3.z, 0.01f);
         }
+
         private static bool vector2Equality(Vector2 originalVector2, Vector2 newVector2)
         {
             return FloatApproximation(originalVector2.x, newVector2.x, 0.01f) && FloatApproximation(originalVector2.y, newVector2.y, 0.01f);
         }
+
         private static bool quaternionEquality(Quaternion originalQuaternion, Quaternion newQuaternion)
         {
             return FloatApproximation(originalQuaternion.x, newQuaternion.x, 0.01f) && FloatApproximation(originalQuaternion.y, newQuaternion.y, 0.01f) && FloatApproximation(originalQuaternion.z, newQuaternion.z, 0.01f) && FloatApproximation(originalQuaternion.w, newQuaternion.w, 0.01f);
diff --git a/Assets/ShortCuts/Editor/Shortcuts.cs b/Assets/ShortCuts/Editor/Shortcuts.cs
index 910426eec..3c6858cdc 100644
--- a/Assets/ShortCuts/Editor/Shortcuts.cs
+++ b/Assets/ShortCuts/Editor/Shortcuts.cs
@@ -1,4 +1,4 @@
-using Altom.AltTesterEditor;
+using AltTesterEditor;
 
 namespace alttester.Assets.ShortCuts.Editor
 {
diff --git a/Bindings~/dotnet/AltDriver.Tests/unit/TestAltBaseCommand.cs b/Bindings~/dotnet/AltDriver.Tests/unit/TestAltBaseCommand.cs
index c5441ecde..8b814300c 100644
--- a/Bindings~/dotnet/AltDriver.Tests/unit/TestAltBaseCommand.cs
+++ b/Bindings~/dotnet/AltDriver.Tests/unit/TestAltBaseCommand.cs
@@ -1,9 +1,9 @@
-using Altom.AltDriver.Commands;
-using Altom.AltDriver.Logging;
+using AltTester.AltDriver.Commands;
+using AltTester.AltDriver.Logging;
 using NUnit.Framework;
 
 
-namespace Altom.AltDriver.Tests
+namespace AltTester.AltDriver.Tests
 {
     public class AltBaseCommandImpl : AltBaseCommand
     {
diff --git a/Bindings~/dotnet/AltDriver.Tests/unit/TestAltPortForwarding.cs b/Bindings~/dotnet/AltDriver.Tests/unit/TestAltPortForwarding.cs
deleted file mode 100644
index 746d49f1e..000000000
--- a/Bindings~/dotnet/AltDriver.Tests/unit/TestAltPortForwarding.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-
-namespace Altom.AltDriver.Tests
-{
-    [Timeout(10000)]
-    [Category("Android")]
-    public class TestAltPortForwarding
-    {
-        private string androidSdkRoot;
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            //store ANDROID_SDK_ROOT original
-            androidSdkRoot = Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT");
-        }
-        [OneTimeTearDown]
-        public void OneTimeTearDown()
-        {
-            //restore ANDROID_SDK_ROOT to original
-            Environment.SetEnvironmentVariable("ANDROID_SDK_ROOT", androidSdkRoot);
-            AltPortForwarding.ForwardAndroid();
-        }
-        [SetUp]
-        public void SetUp()
-        {
-            AltPortForwarding.RemoveAllForwardAndroid();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            //restore ANDROID_SDK_ROOT to original
-            Environment.SetEnvironmentVariable("ANDROID_SDK_ROOT", androidSdkRoot);
-        }
-
-        [Test]
-        public void TestGetAdbPathOverwrite()
-        {
-            Assert.AreEqual("overwrite", AltPortForwarding.GetAdbPath("overwrite"));
-        }
-
-        [Test]
-        public void TestGetAdbPathAndroidSdk()
-        {
-            var sdkPath = string.Join(Path.DirectorySeparatorChar, "path", "to", "sdk");
-            Environment.SetEnvironmentVariable("ANDROID_SDK_ROOT", sdkPath);
-
-            var expected = string.Join(Path.DirectorySeparatorChar, sdkPath, "platform-tools", "adb");
-            Assert.AreEqual(expected, AltPortForwarding.GetAdbPath(""));
-        }
-        [Test]
-        public void TestGetAdbPathSystemPath()
-        {
-            Environment.SetEnvironmentVariable("ANDROID_SDK_ROOT", null);
-            Assert.AreEqual("adb", AltPortForwarding.GetAdbPath(""));
-        }
-
-        // Since changing the build to run on mac this test will fail TODO Filter this test out on mac
-        // [Test]
-        // public void TestRemoveForwardAndroid()
-        // {
-        //     AltPortForwarding.ForwardAndroid();
-        //     AltPortForwarding.RemoveForwardAndroid(13000);
-        //     try
-        //     {
-        //         var driver = new AltDriver(enableLogging: true, connectTimeout: 2);
-        //         driver.Stop();
-        //     }
-        //     catch (Exception ex)
-        //     {
-        //         Console.WriteLine(ex.ToString());
-        //         Assert.AreEqual("Failed to connect to AltTester on host: 127.0.0.1 port: 13000.", ex.Message);
-        //         return;
-        //     }
-        //     Assert.Fail("Should not be able to connect");
-
-        // }
-
-        [Test]
-        public void TestForwardAndroid()
-        {
-            AltPortForwarding.RemoveAllForwardAndroid();
-            AltPortForwarding.ForwardAndroid();
-            try
-            {
-                var driver = TestsHelper.GetAltDriver();
-                driver.Stop();
-            }
-            catch
-            {
-                Assert.Fail("ForwardAndroid failed");
-            }
-        }
-    }
-}
diff --git a/Bindings~/dotnet/AltDriver/AltDriver.csproj b/Bindings~/dotnet/AltDriver/AltDriver.csproj
index 0b84af83a..f5e6bcceb 100644
--- a/Bindings~/dotnet/AltDriver/AltDriver.csproj
+++ b/Bindings~/dotnet/AltDriver/AltDriver.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <PackageId>AltTester-Driver</PackageId>
         <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
-        <RootNamespace>Altom.AltTester-Driver</RootNamespace>
+        <RootNamespace>AltTester.AltTester-Driver</RootNamespace>
         <IsPackable>true</IsPackable>
         <PackageVersion Condition="'$(PACKAGE_VERSION)' == ''">1.8.2</PackageVersion>
         <PackageVersion Condition="'$(PACKAGE_VERSION)' != ''">$(PACKAGE_VERSION)</PackageVersion>
diff --git a/Bindings~/java/CHANGELOG.md b/Bindings~/java/CHANGELOG.md
deleted file mode 100644
index c68318a27..000000000
--- a/Bindings~/java/CHANGELOG.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# AltUnityTester changelog
-
-The latest version of this file can be found at the master branch of the
-AltUnityTester repository.
-
-1.3.0
-- introduce Lombok. In order to use the project with this library you need to install IDE extension from [official page](https://projectlombok.org/download)
-- add unit and integration tests
-- encapsulate Socket instance in [AltUnityDriver](src/main/java/ro/altom/altunitytester/AltUnityDriver.java)
-- make instance of AltUnityDriver package private in [AltUnityObject](/src/main/java/ro/altom/altunitytester/AltUnityObject.java)
-- change logging to use slf4j and log4j as a implementation - annotation based using Lombok
-- add javadoc in the [AltUnityObject](/src/main/java/ro/altom/altunitytester/AltUnityObject.java) for  the state variables - don't access them directly as they will get encapsulated
\ No newline at end of file
diff --git a/Bindings~/java/pom.xml b/Bindings~/java/pom.xml
index 7b96ed8e2..38638e345 100644
--- a/Bindings~/java/pom.xml
+++ b/Bindings~/java/pom.xml
@@ -150,7 +150,7 @@
     </profiles>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/Bindings~/java/src/main/resources/log4j.properties.meta b/Bindings~/java/src/main/resources/log4j.properties.meta
deleted file mode 100644
index 074506bc6..000000000
--- a/Bindings~/java/src/main/resources/log4j.properties.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 244dec0f67bf548d3a7c72657676dbe2
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Bindings~/python/requirements-dev.txt b/Bindings~/python/requirements-dev.txt
index a1c40065e..a8dbff040 100644
--- a/Bindings~/python/requirements-dev.txt
+++ b/Bindings~/python/requirements-dev.txt
@@ -10,4 +10,3 @@ flake8
 pytest
 pytest-cov
 pytest-repeat
-# appium-python-client
diff --git a/Bindings~/python/requirements.txt b/Bindings~/python/requirements.txt
index ae9b82115..2f429537a 100644
--- a/Bindings~/python/requirements.txt
+++ b/Bindings~/python/requirements.txt
@@ -1,4 +1,3 @@
 loguru
 deprecated
-pure-python-adb
 websocket-client
diff --git a/Docs/source/_static/img/advanced-usage/save.png b/Docs/source/_static/img/advanced-usage/save.png
new file mode 100644
index 000000000..a53dc31ca
Binary files /dev/null and b/Docs/source/_static/img/advanced-usage/save.png differ
diff --git a/Docs/source/home.rst b/Docs/source/home.rst
index 663b83276..d2cf67285 100644
--- a/Docs/source/home.rst
+++ b/Docs/source/home.rst
@@ -1,5 +1,5 @@
 AltTester Unity SDK
-===============
+===================
 
 AltTester Unity SDK is an open-source UI driven test automation tool that helps you
 find objects in your game and interacts with them using tests written in C#,
diff --git a/Docs/source/index.rst b/Docs/source/index.rst
index 3bc5fddc8..9027e67c3 100644
--- a/Docs/source/index.rst
+++ b/Docs/source/index.rst
@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 AltTester
-==============
+=========
 
 Through AltTester, we provide a UI Test Automation solution for Unity
 games.
diff --git a/Docs/source/pages/advanced-usage.md b/Docs/source/pages/advanced-usage.md
index 75b760866..09a1f16b2 100644
--- a/Docs/source/pages/advanced-usage.md
+++ b/Docs/source/pages/advanced-usage.md
@@ -101,7 +101,7 @@ commands:
 
     .. tab:: C#
 
-        Available Alt command line arguments:
+        Available AltTester SDK command line arguments:
 
         ``-testsClass`` - runs tests from given class/classes
 
@@ -109,13 +109,13 @@ commands:
 
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsClass MyTestClass -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsClass MyTestClass -logFile logFile.log -batchmode -quit
 
         Example command running tests from two test classes:
 
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsClass MyTestClass1 MyTestClass2 -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsClass MyTestClass1 MyTestClass2 -logFile logFile.log -batchmode -quit
 
         ``-tests`` - runs given test/tests
 
@@ -123,13 +123,13 @@ commands:
 
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -tests MyTestClass.MyTestName -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -tests MyTestClass.MyTestName -logFile logFile.log -batchmode -quit
 
         Example command running two tests:
 
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -tests MyTestClass1.MyTestName1 MyTestClass2.MyTestName2 -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -tests MyTestClass1.MyTestName1 MyTestClass2.MyTestName2 -logFile logFile.log -batchmode -quit
 
         ``-testsAssembly`` - runs tests from given assembly/assemblies
 
@@ -137,19 +137,19 @@ commands:
 
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly MyAssembly -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly MyAssembly -logFile logFile.log -batchmode -quit
 
         Example command running tests from two assemblies:
 
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly MyAssembly1 MyAssembly2 -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -testsAssembly MyAssembly1 MyAssembly2 -logFile logFile.log -batchmode -quit
 
         ``-reportPath`` - the xml test report will be generated here
         
         .. code-block:: bash
 
-            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod Altom.AltTesterEditor.AltTestRunner.RunTestFromCommandLine -tests MyFirstTest.TestStartGame -reportPath $PROJECT_DIR/testReport.xml -logFile logFile.log -batchmode -quit
+            <UnityPath>/Unity -projectPath $PROJECT_DIR -executeMethod AltTesterEditor.AltTestRunner.RunTestFromCommandLine -tests MyFirstTest.TestStartGame -reportPath $PROJECT_DIR/testReport.xml -logFile logFile.log -batchmode -quit
 
     .. tab:: Java
 
@@ -192,7 +192,7 @@ When you run your game instrumented with AltTester Unity SDK, on a device, you n
 to tell your AltDriver how to connect to it.
 
 Port forwarding can be set up either through a command line command or in the
-test code by using the methods available in Alt classes.
+test code by using the methods available in AltTester SDK classes.
 
 The following are some cases when Port Forwarded is needed:
 
@@ -204,7 +204,7 @@ The following are some cases when Port Forwarded is needed:
 Port forwarding can be set up in three ways:
 
 - through a command line command (using ADB/IProxy)
-- in the test code by using the methods available in Alt classes
+- in the test code by using the methods available in AltTester SDK classes
 - from AltTester Editor - Port Forwarding Section
 
 All methods listed above require that you have ADB or IProxy installed.
@@ -332,11 +332,23 @@ For installing IProxy `brew install libimobiledevice`. (_Requires IProxy 2.0.2_)
 
 There are multiple scenarios on how to connect to the AltTester Unity SDK running inside a game:
 
-1. [Connect to the game running on the same machine as the test code](#connect-to-the-game-running-on-the-same-machine-as-the-test-code)
-2. [Connect to the game running on a USB connected device](#connect-to-the-game-running-on-a-usb-connected-device) by using [Port Forwarding](#what-is-port-forwarding-and-when-to-use-it).
-3. [Connect to the device running the game by using an IP address](#connect-to-the-device-running-the-game-by-using-an-ip-address)
-4. [Connect to multiple devices running the game](#connect-to-multiple-devices-running-the-game) by using [Port Forwarding](#what-is-port-forwarding-and-when-to-use-it).
-5. [Connect to multiple builds of the application running on the same device](#connect-to-multiple-builds-of-the-application-running-on-the-same-device)
+- [Advanced Usage](#advanced-usage)
+  - [Build games from the command line](#build-games-from-the-command-line)
+  - [Run tests from the command line](#run-tests-from-the-command-line)
+  - [Run tests on a Continuous Integration Server](#run-tests-on-a-continuous-integration-server)
+  - [What is port forwarding and when to use it](#what-is-port-forwarding-and-when-to-use-it)
+    - [How to setup port forwarding](#how-to-setup-port-forwarding)
+  - [Connect to AltTester Unity SDK running inside the game](#connect-to-alttester-unity-sdk-running-inside-the-game)
+    - [Connect to the game running on the same machine as the test code](#connect-to-the-game-running-on-the-same-machine-as-the-test-code)
+    - [Connect to the game running on a USB connected device](#connect-to-the-game-running-on-a-usb-connected-device)
+    - [Connect to the device running the game by using an IP address](#connect-to-the-device-running-the-game-by-using-an-ip-address)
+    - [Connect to multiple devices running the game](#connect-to-multiple-devices-running-the-game)
+    - [Connect to multiple builds of the application running on the same device](#connect-to-multiple-builds-of-the-application-running-on-the-same-device)
+  - [Using AltTester Unity SDK in Release mode](#using-alttester-unity-sdk-in-release-mode)
+  - [Logging](#logging)
+    - [AltTester Unity SDK logging](#alttester-unity-sdk-logging)
+    - [AltDriver logging](#altdriver-logging)
+  - [Code Stripping](#code-stripping)
 
 ### Connect to the game running on the same machine as the test code
 
@@ -441,7 +453,7 @@ There are two types of logging that can be configured in AltTester Unity SDK. Th
 
 ### AltTester Unity SDK logging
 
-Logging inside the instrumented Unity application is handled using a custom NLog LogFactory. The Server LogFactory can be accessed here: `Altom.AltTester.Logging.ServerLogManager.Instance`
+Logging inside the instrumented Unity application is handled using a custom NLog LogFactory. The Server LogFactory can be accessed here: `AltTester.Logging.ServerLogManager.Instance`
 
 There are two logger targets that you can configure on the server:
 
@@ -479,7 +491,7 @@ Logging on the driver is handled using `NLog` in C#, `loguru` in python and `log
 
     .. tab:: C#
 
-        Logging is handled using a custom NLog LogFactory.  The Driver LogFactory can be accessed here: `Altom.AltDriver.Logging.DriverLogManager.Instance`
+        Logging is handled using a custom NLog LogFactory.  The Driver LogFactory can be accessed here: `AltTester.AltDriver.Logging.DriverLogManager.Instance`
 
         There are three logger targets that you can configure on the driver:
 
@@ -487,7 +499,7 @@ Logging on the driver is handled using `NLog` in C#, `loguru` in python and `log
         * UnityLogger //available only when runnning tests from Unity
         * ConsoleLogger //available only when runnning tests using the Nuget package
 
-        If you want to configure different level of logging for different targets you can use `Altom.AltDriver.Logging.DriverLogManager.SetMinLogLevel(AltLogger.File, AltLogLevel.Info)`
+        If you want to configure different level of logging for different targets you can use `AltTester.AltDriver.Logging.DriverLogManager.SetMinLogLevel(AltLogger.File, AltLogLevel.Info)`
 
         .. code-block:: c#
 
@@ -504,7 +516,7 @@ Logging on the driver is handled using `NLog` in C#, `loguru` in python and `log
             altDriver.SetLogging(enableLogging: true);
 
             /* set logging level to Info for File target */
-            Altom.AltDriver.Logging.DriverLogManager.SetMinLogLevel(AltLogger.File, AltLogLevel.Info);
+            AltTester.AltDriver.Logging.DriverLogManager.SetMinLogLevel(AltLogger.File, AltLogLevel.Info);
 
 
 
@@ -512,17 +524,17 @@ Logging on the driver is handled using `NLog` in C#, `loguru` in python and `log
 
         Logging is handled via log4j. You can use log4j configuration files to customize your logging.
 
-        Setting the `enableLogging` in `AltDriver` initializes logger named `ro.altom.alttester` configured with two appenders, a file appender `AltFileAppender` and a console appender `AltConsoleAppender`
+        Setting the `enableLogging` in `AltDriver` initializes logger named `ro.AltTester` configured with two appenders, a file appender `AltFileAppender` and a console appender `AltConsoleAppender`
 
         .. code-block:: java
 
             /* start AltDriver with logging enabled */
             altDriver = new AltDriver("127.0.0.1", 13000, true);
 
-            /* disable logging for ro.altom.alttester logger */
+            /* disable logging for ro.AltTester logger */
             final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
             final Configuration config = ctx.getConfiguration();
-            config.getLoggerConfig("ro.altom.alttester").setLevel(Level.OFF);
+            config.getLoggerConfig("ro.AltTester").setLevel(Level.OFF);
 
             ctx.updateLoggers();
 
@@ -543,6 +555,12 @@ Logging on the driver is handled using `NLog` in C#, `loguru` in python and `log
 
 ```
 
+## Logging in WebGL
+
+The logs for a WebGL instrumented build are displaied in the browser's console. You can open the `Console` tab by pressing `F12`. To download the logs right click inside the `Console` and choose `Save as...`.
+
+![Save as...](../_static/img/advanced-usage/save.png)
+
 ## Code Stripping
 
 AltTester Unity SDK is using reflection in some of the commands to get information from the instrumented application. If you application is using IL2CPP scripting backend then it might strip code that you would use in your tests. If this is the case we recommend creating an `link.xml` file. More information on how to manage code stripping and create an `link.xml` file is found in [Unity documentation](https://docs.unity3d.com/Manual/ManagedCodeStripping.html)
diff --git a/Docs/source/pages/commands.md b/Docs/source/pages/commands.md
index 4cac449cf..a6bd43f4a 100644
--- a/Docs/source/pages/commands.md
+++ b/Docs/source/pages/commands.md
@@ -3000,7 +3000,7 @@ Invokes a method from an existing component of the object.
             const string methodName = "get_text";
             const string assemblyName = "UnityEngine.UI";
             const string elementText = "Change Camera Mode";
-            var altElement = altUnityDriver.FindObject(By.PATH, "/Canvas/Button/Text");
+            var altElement = altDriver.FindObject(By.PATH, "/Canvas/Button/Text");
             var data = altElement.CallComponentMethod<string>(componentName, methodName, assemblyName, new object[] { });
             Assert.AreEqual(elementText, data);
         }
@@ -3014,7 +3014,7 @@ Invokes a method from an existing component of the object.
             const string assemblyName = "UnityEngine.UI";
             Int32 fontSizeExpected = 16;
             string[] parameters = new[] {"16"};
-            var altElement = altUnityDriver.FindObject(By.PATH, "/Canvas/UnityUIInputField/Text");
+            var altElement = altDriver.FindObject(By.PATH, "/Canvas/UnityUIInputField/Text");
             var data = altElement.CallComponentMethod<string>(componentName, methodName, assemblyName, parameters);
             var fontSize =  altElement.CallComponentMethod<Int32>(componentName, methodToVerifyName, assemblyName, new object[] { });
             Assert.AreEqual(fontSizeExpected, fontSize);
@@ -3047,9 +3047,9 @@ Invokes a method from an existing component of the object.
             String methodName = "get_text";
             String assembly = "UnityEngine.UI";
             String expected_text = "Change Camera Mode";
-            AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltUnityDriver.By.PATH,
+            AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltDriver.By.PATH,
                 "/Canvas/Button/Text").build();
-            AltUnityObject altElement = altUnityDriver.findObject(altFindObjectsParams);
+            AltObject altElement = altDriver.findObject(altFindObjectsParams);
             assertEquals(expected_text, altElement.callComponentMethod(
                 new AltCallComponentMethodParams.Builder(componentName, methodName, assembly, new Object[] {}).build(),
                 String.class));
@@ -3063,9 +3063,9 @@ Invokes a method from an existing component of the object.
             String methodExpectedName = "get_fontSize";
             String assembly = "UnityEngine.UI";
             String[] parameters = new String[] { "16"};
-            AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltUnityDriver.By.PATH,
+            AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltDriver.By.PATH,
             "/Canvas/UnityUIInputField/Text").build();
-            AltUnityObject altElement = altUnityDriver.findObject(altFindObjectsParams);
+            AltObject altElement = altDriver.findObject(altFindObjectsParams);
             altElement.callComponentMethod(
                 new AltCallComponentMethodParams.Builder(componentName, methodName, assembly, parameters)
                     .build(),
@@ -3128,7 +3128,7 @@ Returns the value of the given component property.
         [Test]
         public void TestGetComponentProperty()
         {
-            const string componentName = "Altom.AltTester.AltRunner";
+            const string componentName = "AltTester.AltRunner";
             const string propertyName = "InstrumentationSettings.AltTesterPort";
             var altObject = altDriver.FindObject(By.NAME,"AltRunnerPrefab");
             Assert.NotNull(altObject);
@@ -3141,7 +3141,7 @@ Returns the value of the given component property.
         @Test
         public void testGetComponentProperty() throws Exception
         {
-            String componentName = "Altom.AltTester.AltRunner";
+            String componentName = "AltTester.AltRunner";
             String propertyName = "InstrumentationSettings.AltTesterPort";
             AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltDriver.By.NAME, "AltRunnerPrefab").isEnabled(true).withCamera("Main Camera").build();
             AltObject altObject = altDriver.findObject(altFindObjectsParams);
diff --git a/Docs/source/pages/faq-troubleshooting.md b/Docs/source/pages/faq-troubleshooting.md
index b87406933..ff66fd33c 100644
--- a/Docs/source/pages/faq-troubleshooting.md
+++ b/Docs/source/pages/faq-troubleshooting.md
@@ -59,13 +59,6 @@ The popup message shows up when you start your instrumented Unity App. It tells
 </details>
 <br>
 
-<details>
-<summary> Why do I get an <strong>error when trying to call the port forwarding </strong>methods? </summary>
-<br>
-You need to make sure the following third party tools are installed: ADB - Android  or iproxy - iOS. For more information you can check our <a href="advanced-usage.html#how-to-setup-port-forwarding">setup port forwarding guide</a>.
-</details>
-<br>
-
 <details>
 <summary>I get the error: <strong>Multiple precompiled assemblies with the same name Newtonsoft.Json.dll included or the current platform.</strong> </summary>
 <br>
diff --git a/Docs/source/pages/get-started.md b/Docs/source/pages/get-started.md
index 120cb8be0..8af008bec 100644
--- a/Docs/source/pages/get-started.md
+++ b/Docs/source/pages/get-started.md
@@ -125,11 +125,10 @@ Steps:
 
     To be able to run your instrumented game in the background, go to File -> Build Settings -> Player Settings -> Project Settings -> Player -> Resolution and presentation and check the box next to Run in background.
 
-```
+.. note::
 
-<!--
+    To make sure you can catch possible exceptions thrown from your tests, you'll have to go to `Edit -> Project Settings -> Player -> Publishing Settings` and set `Enable Exceptions` to `Full With Stacktrace`.
 
-```eval_rst
 .. note::
 
     When running the WebGL build of your game in browser, even with the Run in background setting enabled, you still might experience slow performance if the tab with your content is not on focus. Make sure that the tab with your app is visible, otherwise your content will only update once per second in most browsers.
@@ -139,7 +138,7 @@ Steps:
 ## Start the Proxy Module
 
 The Proxy Module is incorporated in AltTester Desktop. In order to start it, all you have to do is to start AltTester Desktop.
--->
+
 
 ## Run your game in Unity or on desired platform
 
diff --git a/Docs/source/pages/known-issues.rst b/Docs/source/pages/known-issues.rst
index 718a4345b..bb1642127 100644
--- a/Docs/source/pages/known-issues.rst
+++ b/Docs/source/pages/known-issues.rst
@@ -53,7 +53,7 @@ instead.
 **Affects**: AltUnity Tester v1.7.1, v1.7.2 and AltTester Unity SDK v1.8.*
 
 Player Input is not working when connected to AltTester Unity SDK/Desktop
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 **Problem**: Player Input is not working in the instrumented build when
 connected to the tests or to AltTester Desktop.
@@ -67,7 +67,7 @@ BlueStacks
 ----------
 
 Instrumented game with AltTester Unity SDK stops working in BlueStacks
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 **Workaround**: The issue seems to happen because of the communication protocol
 used inside the AltTester Unity SDK. There are other alternatives that work with
diff --git a/Docs/source/pages/upgrade-guides/v-1-8-0.rst b/Docs/source/pages/upgrade-guides/v-1-8-0.rst
index 2b59d7261..755819200 100644
--- a/Docs/source/pages/upgrade-guides/v-1-8-0.rst
+++ b/Docs/source/pages/upgrade-guides/v-1-8-0.rst
@@ -82,7 +82,7 @@ With:
     <PropertyGroup>
         <PackageId>AltTester-Driver</PackageId>
         <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
-        <RootNamespace>Altom.AltTester-Driver</RootNamespace>
+        <RootNamespace>AltTester.AltTester-Driver</RootNamespace>
     </PropertyGroup>
     
 Java


Test patch:
diff --git a/Bindings~/java/src/main/java/com/alttester/AltDriver.java b/Bindings~/java/src/main/java/com/alttester/AltDriver.java
index 4d2552f28..47eadd09d 100644
--- a/Bindings~/java/src/main/java/com/alttester/AltDriver.java
+++ b/Bindings~/java/src/main/java/com/alttester/AltDriver.java
@@ -27,7 +27,7 @@ public class AltDriver {
         ConfigurationFactory.setConfigurationFactory(custom);
     }
 
-    private static final Logger log = LogManager.getLogger(AltDriver.class);
+    private static final Logger logger = LogManager.getLogger(AltDriver.class);
 
     public static enum PlayerPrefsKeyType {
         Int(1), String(2), Float(3);
@@ -61,16 +61,22 @@ public AltDriver(String host, int port, Boolean enableLogging) {
     }
 
     public AltDriver(String host, int port, Boolean enableLogging, int connectTimeout) {
+        this(host, port, enableLogging, connectTimeout, "__default__");
+    }
+
+    public AltDriver(String host, int port, Boolean enableLogging, int connectTimeout, String gameName) {
         if (!enableLogging) {
             AltDriverConfigFactory.DisableLogging();
         }
 
         if (host == null || host.isEmpty()) {
-            throw new InvalidParameterException("Provided host address is null or empty");
+            throw new InvalidParameterException("Provided host address is null or empty.");
         }
 
-        this.connection = new WebsocketConnection(host, port, connectTimeout);
+        logger.debug("Connecting to AltTester on host: '{}', port: '{}' and gameName: '{}'.", host, port, gameName);
+        this.connection = new WebsocketConnection(host, port, connectTimeout, gameName);
         this.connection.connect();
+
         checkServerVersion();
     }
 
@@ -112,7 +118,7 @@ private void checkServerVersion() {
             String message = String.format(
                     "Version mismatch. AltDriver version is %s. AltTester version is %s.",
                     AltDriver.VERSION, serverVersion);
-            log.warn(message);
+            logger.warn(message);
             System.out.println(message);
         }
     }
diff --git a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java
index 9c25b0431..5dbcefea5 100644
--- a/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java
+++ b/Bindings~/java/src/main/java/com/alttester/WebsocketConnection.java
@@ -1,6 +1,8 @@
 package com.alttester;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import javax.websocket.ClientEndpoint;
 import javax.websocket.CloseReason;
@@ -8,16 +10,14 @@
 import javax.websocket.DeploymentException;
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
-import java.net.URI;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import com.alttester.altTesterExceptions.*;
 
 @ClientEndpoint
@@ -26,87 +26,81 @@ public class WebsocketConnection {
     private String _uri;
     private String _host;
     private int _port;
+    private String _gameName;
     private int _connectTimeout;
+
     public Session session = null;
     public IMessageHandler messageHandler = null;
 
-    @OnOpen
-    public void onOpen(Session session) {
-        logger.debug("Connected to: " + _uri);
-        this.session = session;
-        this.messageHandler = new MessageHandler(session);
-    }
-
-    @OnMessage
-    public void onMessage(String message) {
-        messageHandler.onMessage(message);
-    }
-
-    // Processing when receiving a message
-    @OnError
-    public void onError(Throwable th) {
-        logger.error(th.getMessage());
-        logger.error(th);
-    }
-
-    // Processing at session release
-    @OnClose
-    public void onClose(Session session, CloseReason reason) {
-        logger.debug("Connection to AltTester closed: {}.", reason.toString());
-    }
-
-    public WebsocketConnection(String host, int port, int connectTimeout) {
+    public WebsocketConnection(String host, int port, int connectTimeout, String gameName) {
         _host = host;
         _port = port;
-        _uri = "ws://" + host + ":" + port + "/altws/";
+        _gameName = gameName;
         _connectTimeout = connectTimeout;
     }
 
+    public URI getURI() throws ConnectionException {
+        try {
+            return new URI("ws", null, _host, _port, "/altws", "game=" + _gameName, null);
+        } catch (URISyntaxException e) {
+            logger.error(e);
+            throw new ConnectionException(e.getMessage(), e);
+        }
+    }
+
     public void connect() {
+        URI uri = getURI();
+        logger.info("Connecting to: '{}'.", uri.toString());
+
         int delay = 100;
-        logger.info("Connecting to host: {} port: {}.", _host, _port);
+        int retries = 0;
+        long timeout = _connectTimeout * 1000;
         long start = System.currentTimeMillis();
         long finish = System.currentTimeMillis();
-        int retries = 0;
 
         WebSocketContainer container = ContainerProvider.getWebSocketContainer();
 
         Exception connectionError = null;
-        while (finish - start < _connectTimeout * 1000) {
+
+        while (finish - start < timeout) {
             try {
                 if (retries > 0) {
-                    logger.debug("Retrying #{} to host: {} port: {}.", retries, _host, _port);
+                    logger.debug("Retrying #{} to: '{}'.", retries, uri);
                 }
 
-                this.session = container.connectToServer(this, URI.create(_uri));
-
+                this.session = container.connectToServer(this, uri);
             } catch (IllegalStateException e) {
                 logger.error(e);
                 throw new ConnectionException(e.getMessage(), e);
             } catch (DeploymentException | IOException e) {
                 connectionError = e;
             }
+
             try {
                 Thread.sleep(delay); // delay between retries
             } catch (InterruptedException e) {
                 break;
             }
 
-            if (this.session != null && this.session.isOpen())
+            if (this.session != null && this.session.isOpen()) {
                 break;
+            }
 
             retries++;
             finish = System.currentTimeMillis();
         }
-        if (this.session == null || (!this.session.isOpen() && finish - start >= _connectTimeout * 1000)) {
+
+        if (this.session == null || (!this.session.isOpen() && finish - start >= timeout)) {
             throw new ConnectionTimeoutException(
                     String.format("Failed to connect to AltTester on host: %s port: %s.", _host, _port),
                     connectionError);
         }
-        if (!this.session.isOpen())
+
+        if (!this.session.isOpen()) {
             throw new ConnectionException(
                     String.format("Failed to connect to AltTester on host: %s port: %s.", _host, _port),
                     connectionError);
+        }
     }
 
     public void close() throws IOException {
@@ -116,4 +110,29 @@ public void close() throws IOException {
             this.session.close();
         }
     }
-}
\ No newline at end of file
+
+    @OnOpen
+    public void onOpen(Session session) {
+        logger.debug("Connected to: " + session.getRequestURI().toString());
+        this.session = session;
+        this.messageHandler = new MessageHandler(session);
+    }
+
+    @OnMessage
+    public void onMessage(String message) {
+        messageHandler.onMessage(message);
+    }
+
+    // Processing when receiving a message
+    @OnError
+    public void onError(Throwable th) {
+        logger.error(th.getMessage());
+        logger.error(th);
+    }
+
+    // Processing at session release
+    @OnClose
+    public void onClose(Session session, CloseReason reason) {
+        logger.debug("Connection to AltTester closed: {}.", reason.toString());
+    }
+}
diff --git a/Bindings~/java/src/test/java/com/alttester/TestsHelper.java b/Bindings~/java/src/test/java/com/alttester/TestsHelper.java
index 872ab64e0..e6e7453af 100644
--- a/Bindings~/java/src/test/java/com/alttester/TestsHelper.java
+++ b/Bindings~/java/src/test/java/com/alttester/TestsHelper.java
@@ -6,8 +6,9 @@
 
 public class TestsHelper {
     public static int GetAltDriverPort() {
-        String port = System.getenv("ALTDRIVER_PORT");
-        if (port != null && port == "") {
+        String port = System.getenv("PROXY_PORT");
+
+        if (port != null && port != "") {
             return Integer.parseInt(port);
         }
 
@@ -15,8 +16,9 @@ public static int GetAltDriverPort() {
     }
 
     public static String GetAltDriverHost() {
-        String host = System.getenv("ALTDRIVER_HOST");
-        if (host != null && host == "") {
+        String host = System.getenv("PROXY_HOST");
+
+        if (host != null && host != "") {
             return host;
         }
 
diff --git a/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java b/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java
index 1a4d44eda..a55401f25 100644
--- a/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java
+++ b/Bindings~/java/src/test/java/com/alttester/TestsNotifications.java
@@ -104,7 +104,7 @@ public void testApplicationPausedNotification() throws Exception {
                                 "AltTesterPrefab").build();
                 AltObject altElement = altDriver.findObject(altFindObjectsParameters);
 
-                altElement.callComponentMethod(new AltCallComponentMethodParams.Builder("Altom.AltTester.AltRunner",
+                altElement.callComponentMethod(new AltCallComponentMethodParams.Builder("AltTester.AltRunner",
                                 "OnApplicationPause", "Assembly-CSharp", new Object[] { true }).build(), Void.class);
         }
 
diff --git a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java
index 334e5abd3..6b3b431ea 100644
--- a/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java
+++ b/Bindings~/java/src/test/java/com/alttester/TestsSampleScene1.java
@@ -270,7 +270,7 @@ public void testFindElementByComponent() throws InterruptedException {
         @Test
         public void testFindElementByComponentWithNamespace() throws InterruptedException {
                 Thread.sleep(1000);
-                String componentName = "Altom.AltTester.AltRunner";
+                String componentName = "AltTester.AltRunner";
                 AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(
                                 AltDriver.By.COMPONENT, componentName).build();
                 AltObject altElement = altDriver.findObject(altFindObjectsParams);
@@ -281,7 +281,7 @@ public void testFindElementByComponentWithNamespace() throws InterruptedExceptio
         @Test
         public void testGetComponentProperty() throws InterruptedException {
                 Thread.sleep(1000);
-                String componentName = "Altom.AltTester.AltRunner";
+                String componentName = "AltTester.AltRunner";
                 String propertyName = "InstrumentationSettings.ShowPopUp";
                 AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltDriver.By.NAME,
                                 "AltTesterPrefab").build();
@@ -297,7 +297,7 @@ public void testGetComponentProperty() throws InterruptedException {
 
         @Test
         public void testGetComponentPropertyInvalidDeserialization() {
-                String componentName = "Altom.AltTester.AltRunner";
+                String componentName = "AltTester.AltRunner";
                 String propertyName = "InstrumentationSettings.ShowPopUp";
                 AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltDriver.By.NAME,
                                 "AltTesterPrefab").build();
@@ -318,7 +318,7 @@ public void testGetComponentPropertyInvalidDeserialization() {
         @Test(expected = PropertyNotFoundException.class)
         public void testGetNonExistingComponentProperty() throws InterruptedException {
                 Thread.sleep(1000);
-                String componentName = "Altom.AltTester.AltRunner";
+                String componentName = "AltTester.AltRunner";
                 String propertyName = "socketPort";
                 AltFindObjectsParams altFindObjectsParams = new AltFindObjectsParams.Builder(AltDriver.By.NAME,
                                 "AltTesterPrefab").build();
@@ -1496,7 +1496,7 @@ public void testResetInput() throws InterruptedException {
                                 AltDriver.By.NAME, "AltTesterPrefab").build();
 
                 AltGetComponentPropertyParams pIsPressed = new AltGetComponentPropertyParams.Builder(
-                                "Altom.AltTester.NewInputSystem",
+                                "AltTester.NewInputSystem",
                                 "Keyboard.pKey.isPressed", "Assembly-CSharp").build();
                 AltGetComponentPropertyParams count = new AltGetComponentPropertyParams.Builder(
                                 "Input",
diff --git a/Bindings~/python/alttester/__init__.py b/Bindings~/python/alttester/__init__.py
index 8f483d199..0f7c7918c 100644
--- a/Bindings~/python/alttester/__init__.py
+++ b/Bindings~/python/alttester/__init__.py
@@ -4,5 +4,4 @@
 from alttester.playerpref import PlayerPrefKeyType
 from alttester.keycode import AltKeyCode
 from alttester.logging import AltLogLevel, AltLogger
-from alttester.portforwarding import AltPortForwarding
 from alttester.exceptions import *
diff --git a/Bindings~/python/alttester/_websocket.py b/Bindings~/python/alttester/_websocket.py
index 7b4540764..b85a15d09 100644
--- a/Bindings~/python/alttester/_websocket.py
+++ b/Bindings~/python/alttester/_websocket.py
@@ -1,6 +1,7 @@
 import time
 import json
 from collections import defaultdict, deque
+from urllib.parse import urlencode, urlunparse
 from threading import Thread
 
 from loguru import logger
@@ -128,16 +129,21 @@ class WebsocketConnection:
     """Handles the websocket connection with AltTester.
 
     Args:
-        host (:obj:`str`): The host to connect to.
-        port (:obj:`int`): The port to connect to.
-        timeout (:obj:`int` or :obj:`float`): The connection timeout time.
+        host (:obj:`str`, optional): The host to connect to. Defaults to ``127.0.0.1``.
+        port (:obj:`int`, optional): The port to connect to. Defaults to ``13000``.
+        path (:obj:`int`, optional): The path section of the url. Defaults to ``/``.
+        params (:obj:`dict`, optional): The params/query component of the url. Default to ``None``.
+        timeout (:obj:`int` or :obj:`float`, optional): The connection timeout time.
 
     """
 
-    def __init__(self, host="127.0.0.1", port=13000, timeout=None):
+    def __init__(self, host="127.0.0.1", port=13000, path="/", params=None, timeout=None):
         self.host = host
         self.port = port
-        self.url = "ws://{}:{}/altws/".format(host, port)
+        self.path = path
+        self.params = params or {}
+
+        self.url = urlunparse(["ws", "{}:{}".format(self.host, self.port), self.path, "", urlencode(self.params), ""])
 
         self.timeout = timeout
         self.command_timeout = 60
@@ -153,10 +159,12 @@ def __init__(self, host="127.0.0.1", port=13000, timeout=None):
         self._notification_handler = NotificationHandler()
 
     def __repr__(self):
-        return "{}({!r}, {!r}, {!r})".format(
+        return "{}({!r}, {!r}, {!r}, {!r}, {!r})".format(
             self.__class__.__name__,
             self.host,
             self.port,
+            self.path,
+            self.params,
             self.timeout,
         )
 
@@ -184,7 +192,7 @@ def _ensure_connection_is_open(self):
             raise ConnectionError("Connection already closed.")
 
     def _on_message(self, ws, message):
-        """A callback which is called when the connection is opened."""
+        """A callback which is called when the connection receives data."""
 
         logger.debug("Received: {}", message)
         response = json.loads(message)
@@ -213,9 +221,9 @@ def _on_close(self, ws, close_status_code, close_msg):
         self._websocket = None
 
     def _on_open(self, ws):
-        """A callback which is called when the connection recives data."""
+        """A callback which is called when the connection is opened."""
 
-        logger.debug("Connection oppend successfully.")
+        logger.debug("Connection opened successfully.")
         self._is_open = True
 
     def set_command_timeout(self, timeout):
@@ -225,7 +233,7 @@ def get_command_timeout(self):
         return self.command_timeout
 
     def connect(self):
-        logger.info("Connecting to host: {} port: {}.", self.host, self.port)
+        logger.info("Connecting to URL: '{}'.", self.url)
 
         elapsed_time = 0
         self._create_connection()
diff --git a/Bindings~/python/alttester/altdriver.py b/Bindings~/python/alttester/altdriver.py
index 8428e991d..f93aacd90 100644
--- a/Bindings~/python/alttester/altdriver.py
+++ b/Bindings~/python/alttester/altdriver.py
@@ -22,23 +22,48 @@ class AltDriver:
     instance will connect to the AltProxy.
 
     Args:
-        host (:obj:`str`): The proxy host to connect to.
-        port (:obj:`int`): The proxy port to connect to.
+        host (:obj:`str`, optional): The proxy host to connect to.
+        port (:obj:`int`, optional): The proxy port to connect to.
+        game_name (:obj:`str`, optional): The game name. Defaults to ``__default__``.
         enable_logging (:obj:`bool`, optional): If set to ``True`` will turn on logging, by default logging is disabled.
         timeout (:obj:`int`, :obj:`float`, optional): The connect timeout time in seconds.
 
     """
 
-    def __init__(self, host="127.0.0.1", port=13000, enable_logging=False, timeout=None):
+    def __init__(self, host="127.0.0.1", port=13000, game_name="__default__", enable_logging=False, timeout=None):
         self.host = host
         self.port = port
+        self.game_name = game_name
         self.enable_logging = enable_logging
+        self.timeout = timeout
 
         self._config_logging(self.enable_logging)
 
-        self._connection = WebsocketConnection(host=host, port=port, timeout=timeout)
+        logger.debug(
+            "Connecting to AltTester on host: '{}', port: '{}' and gameName: '{}'.",
+            self.host,
+            self.port,
+            self.game_name
+        )
+        self._connection = WebsocketConnection(
+            host=self.host,
+            port=self.port,
+            timeout=self.timeout,
+            path="altws",
+            params={"game": self.game_name}
+        )
         self._connection.connect()
 
+    def __repr__(self):
+        return "{}({!r}, {!r}, {!r}, {!r}, {!r})".format(
+            self.__class__.__name__,
+            self.host,
+            self.port,
+            self.game_name,
+            self.enable_logging,
+            self.timeout
+        )
+
     @staticmethod
     def _config_logging(enable_logging):
         if enable_logging:
diff --git a/Bindings~/python/alttester/commands/AltTesterCommands/reset_input.py b/Bindings~/python/alttester/commands/AltTesterCommands/reset_input.py
index 7d86fcf61..841eba8c8 100644
--- a/Bindings~/python/alttester/commands/AltTesterCommands/reset_input.py
+++ b/Bindings~/python/alttester/commands/AltTesterCommands/reset_input.py
@@ -1,6 +1,4 @@
 from alttester.commands.base_command import BaseCommand
-from alttester.logging import AltLogger, AltLogLevel
-from alttester.exceptions import InvalidParameterTypeException
 
 
 class ResetInput(BaseCommand):
diff --git a/Bindings~/python/alttester/portforwarding.py b/Bindings~/python/alttester/portforwarding.py
deleted file mode 100644
index 826b4b216..000000000
--- a/Bindings~/python/alttester/portforwarding.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import subprocess
-
-from ppadb.client import Client as AdbClient
-
-
-class AltPortForwarding:
-    _client = AdbClient(host="127.0.0.1", port=5037)
-
-    @staticmethod
-    def _get_iproxy_path(iproxy_path):
-        if not iproxy_path:
-            return "iproxy"
-        return iproxy_path
-
-    @classmethod
-    def _get_device(cls, device_id=""):
-        if device_id == "":
-            devices = cls._client.devices()
-            if len(devices) == 0:
-                raise Exception("No device found")
-            return devices[0]
-        else:
-            return cls._client.device(device_id)
-
-    @staticmethod
-    def forward_ios(local_port=13000, device_port=13000, device_id="", iproxy_path=""):
-        process = None
-        iproxy_path = AltPortForwarding._get_iproxy_path(iproxy_path)
-        if device_id == "":
-            process = subprocess.Popen(
-                [iproxy_path, str(local_port), str(device_port)])
-        else:
-            process = subprocess.Popen(
-                [iproxy_path, str(local_port), str(device_port), "-u", device_id])
-        return process.pid
-
-    @staticmethod
-    def kill_iproxy(pid):
-        subprocess.Popen(['kill', str(pid)]).wait()
-
-    @staticmethod
-    def kill_all_iproxy_process():
-        subprocess.Popen(['killall', 'iproxy']).wait()
-
-    @staticmethod
-    def forward_android(local_port=13000, device_port=13000, device_id=""):
-        device = AltPortForwarding._get_device(device_id)
-
-        device.forward("tcp:" + str(local_port), "tcp:" + str(device_port))
-
-    @staticmethod
-    def remove_forward_android(local_port=13000, device_id=""):
-        device = AltPortForwarding._get_device(device_id)
-        device.killforward("tcp:" + str(local_port))
-
-    @staticmethod
-    def remove_all_forward_android():
-        AltPortForwarding._client.killforward_all()
diff --git a/Bindings~/python/tests/integration/conftest.py b/Bindings~/python/tests/integration/conftest.py
index e588ea2f6..99c26187f 100644
--- a/Bindings~/python/tests/integration/conftest.py
+++ b/Bindings~/python/tests/integration/conftest.py
@@ -8,12 +8,12 @@
 
 
 def get_alttester_port():
-    port = os.environ.get("ALTTESTER_DRIVER_PORT", 13000)
+    port = os.environ.get("PROXY_PORT", 13000)
     return int(port)
 
 
 def get_alttester_host():
-    return os.environ.get("ALTTESTER_DRIVER_HOST", "127.0.0.1")
+    return os.environ.get("PROXY_HOST", "127.0.0.1")
 
 
 @pytest.fixture(scope="session")
@@ -22,7 +22,7 @@ def altdriver():
         host=get_alttester_host(),
         port=get_alttester_port(),
         enable_logging=True,
-        timeout=None
+        timeout=60 * 5
     )
 
     yield altdriver
diff --git a/Bindings~/python/tests/integration/test_driver.py b/Bindings~/python/tests/integration/test_driver.py
index 79019665f..d537e2d7a 100644
--- a/Bindings~/python/tests/integration/test_driver.py
+++ b/Bindings~/python/tests/integration/test_driver.py
@@ -90,7 +90,7 @@ def test_unload_only_scene(self):
 
     def test_set_server_logging(self):
         rule = self.altdriver.call_static_method(
-            "Altom.AltTester.Logging.ServerLogManager",
+            "AltTester.Logging.ServerLogManager",
             "Instance.Configuration.FindRuleByName",
             "Assembly-CSharp",
             parameters=["AltServerFileRule"],
@@ -101,7 +101,7 @@ def test_set_server_logging(self):
 
         self.altdriver.set_server_logging(AltLogger.File, AltLogLevel.Off)
         rule = self.altdriver.call_static_method(
-            "Altom.AltTester.Logging.ServerLogManager",
+            "AltTester.Logging.ServerLogManager",
             "Instance.Configuration.FindRuleByName",
             "Assembly-CSharp",
             parameters=["AltServerFileRule"],
diff --git a/Bindings~/python/tests/integration/test_notifications.py b/Bindings~/python/tests/integration/test_notifications.py
index 821e5c0a6..64f0e93a9 100644
--- a/Bindings~/python/tests/integration/test_notifications.py
+++ b/Bindings~/python/tests/integration/test_notifications.py
@@ -71,7 +71,7 @@ def test_application_paused_notification(self):
         self.altdriver.load_scene(Scenes.Scene01)
         alt_object = self.altdriver.find_object(By.NAME, "AltTesterPrefab")
         alt_object.call_component_method(
-            "Altom.AltTester.AltRunner", "OnApplicationPause", "Assembly-CSharp",
+            "AltTester.AltRunner", "OnApplicationPause", "Assembly-CSharp",
             parameters=[True],
             type_of_parameters=["System.Boolean"]
         )
diff --git a/Bindings~/python/tests/integration/test_scene01.py b/Bindings~/python/tests/integration/test_scene01.py
index 2f1461006..603bb445a 100644
--- a/Bindings~/python/tests/integration/test_scene01.py
+++ b/Bindings~/python/tests/integration/test_scene01.py
@@ -825,10 +825,10 @@ def test_call_private_method(self):
     def test_reset_input(self):
         self.altdriver.key_down(AltKeyCode.P, 1)
         assert self.altdriver.find_object(By.NAME, "AltTesterPrefab").get_component_property(
-            "Altom.AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp") is True
+            "AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp") is True
         self.altdriver.reset_input()
         assert self.altdriver.find_object(By.NAME, "AltTesterPrefab").get_component_property(
-            "Altom.AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp") is False
+            "AltTester.NewInputSystem", "Keyboard.pKey.isPressed", "Assembly-CSharp") is False
 
         countKeyDown = self.altdriver.find_object(By.NAME, "AltTesterPrefab").get_component_property(
             "Input", "_keyCodesPressed.Count", "Assembly-CSharp")
diff --git a/Bindings~/python/tests/integration/test_scene07.py b/Bindings~/python/tests/integration/test_scene07.py
index 51f821a42..3ee59b7f7 100644
--- a/Bindings~/python/tests/integration/test_scene07.py
+++ b/Bindings~/python/tests/integration/test_scene07.py
@@ -1,7 +1,7 @@
 import pytest
+from alttester import By
 
 from .utils import Scenes
-from alttester import By
 
 
 class TestScene07A:
diff --git a/Bindings~/python/tests/unit/test_portforwarding.py b/Bindings~/python/tests/unit/test_portforwarding.py
deleted file mode 100644
index c70de0ab1..000000000
--- a/Bindings~/python/tests/unit/test_portforwarding.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from alttester.portforwarding import AltPortForwarding
-
-
-class TestAltPortForwarding:
-
-    def test_get_iproxy_path(self):
-        assert "overwrite" == AltPortForwarding._get_iproxy_path("overwrite")
-        assert "iproxy" == AltPortForwarding._get_iproxy_path("")
diff --git a/Docs/source/_static/examples~/common/csharp-android-test.cs b/Docs/source/_static/examples~/common/csharp-android-test.cs
index 130af372f..9f31162a2 100644
--- a/Docs/source/_static/examples~/common/csharp-android-test.cs
+++ b/Docs/source/_static/examples~/common/csharp-android-test.cs
@@ -1,33 +1,33 @@
 using NUnit.Framework;
-using Altom.AltDriver;
+using AltTester.AltDriver;
 
 public class MyFirstTest
 {
-  private AltDriver altDriver;
+    private AltDriver altDriver;
 
-  [OneTimeSetUp]
-  public void SetUp()
-  {
-    AltPortForwarding.ForwardAndroid();
-    altDriver = new AltDriver();
-  }
+    [OneTimeSetUp]
+    public void SetUp()
+    {
+        AltPortForwarding.ForwardAndroid();
+        altDriver = new AltDriver();
+    }
 
-  [OneTimeTearDown]
-  public void TearDown()
-  {
-    altDriver.Stop();
-    AltPortForwarding.RemoveForwardAndroid();
-  }
+    [OneTimeTearDown]
+    public void TearDown()
+    {
+        altDriver.Stop();
+        AltPortForwarding.RemoveForwardAndroid();
+    }
 
-  [Test]
-  public void TestStartGame()
-  {
-    altDriver.LoadScene("Scene 2 Draggable Panel");
+    [Test]
+    public void TestStartGame()
+    {
+        altDriver.LoadScene("Scene 2 Draggable Panel");
 
-    altDriver.FindObject(By.NAME, "Close Button").Tap();
-    altDriver.FindObject(By.NAME, "Button").Tap();
+        altDriver.FindObject(By.NAME, "Close Button").Tap();
+        altDriver.FindObject(By.NAME, "Button").Tap();
 
-    var panelElement = altDriver.WaitForObject(By.NAME, "Panel");
-    Assert.IsTrue(panelElement.enabled);
-  }
+        var panelElement = altDriver.WaitForObject(By.NAME, "Panel");
+        Assert.IsTrue(panelElement.enabled);
+    }
 }
diff --git a/Docs/source/_static/examples~/common/csharp-ios-test.cs b/Docs/source/_static/examples~/common/csharp-ios-test.cs
index 1b8b7763f..9e8e52248 100644
--- a/Docs/source/_static/examples~/common/csharp-ios-test.cs
+++ b/Docs/source/_static/examples~/common/csharp-ios-test.cs
@@ -1,33 +1,33 @@
 using NUnit.Framework;
-using Altom.AltDriver;
+using AltTester.AltDriver;
 
 public class MyFirstTest
 {
-  private AltDriver altDriver;
+    private AltDriver altDriver;
 
-  [OneTimeSetUp]
-  public void SetUp()
-  {
-    AltPortForwarding.ForwardIos();
-    altDriver = new AltDriver();
-  }
+    [OneTimeSetUp]
+    public void SetUp()
+    {
+        AltPortForwarding.ForwardIos();
+        altDriver = new AltDriver();
+    }
 
-  [OneTimeTearDown]
-  public void TearDown()
-  {
-    altDriver.Stop();
-    AltPortForwarding.KillAllIproxyProcess();
-  }
+    [OneTimeTearDown]
+    public void TearDown()
+    {
+        altDriver.Stop();
+        AltPortForwarding.KillAllIproxyProcess();
+    }
 
-  [Test]
-  public void TestStartGame()
-  {
-    altDriver.LoadScene("Scene 2 Draggable Panel");
+    [Test]
+    public void TestStartGame()
+    {
+        altDriver.LoadScene("Scene 2 Draggable Panel");
 
-    altDriver.FindObject(By.NAME, "Close Button").Tap();
-    altDriver.FindObject(By.NAME, "Button").Tap();
+        altDriver.FindObject(By.NAME, "Close Button").Tap();
+        altDriver.FindObject(By.NAME, "Button").Tap();
 
-    var panelElement = altDriver.WaitForObject(By.NAME, "Panel");
-    Assert.IsTrue(panelElement.enabled);
-  }
+        var panelElement = altDriver.WaitForObject(By.NAME, "Panel");
+        Assert.IsTrue(panelElement.enabled);
+    }
 }
diff --git a/Docs/source/_static/examples~/common/java-android-test.java b/Docs/source/_static/examples~/common/java-android-test.java
index 74b55798c..e1e16e5d3 100644
--- a/Docs/source/_static/examples~/common/java-android-test.java
+++ b/Docs/source/_static/examples~/common/java-android-test.java
@@ -12,49 +12,49 @@
 
 public class myFirstTest {
 
-        private static AltDriver altDriver;
-
-        @BeforeClass
-        public static void setUp() throws IOException {
-                AltPortForwarding.forwardAndroid();
-                altDriver = new AltDriver();
-        }
-
-        @AfterClass
-        public static void tearDown() throws Exception {
-                altDriver.stop();
-                AltPortForwarding.removeForwardAndroid();
-        }
-
-        @Test
-        public void openClosePanelTest() {
-                altDriver.loadScene("Scene 2 Draggable Panel");
-
-                AltFindObjectsParameters altFindObjectsParametersCamera = new AltFindObjectsParameters.Builder(
-                                AltDriver.By.PATH, "//Main Camera")
-                                .build();
-                AltObject camera = altDriver.findObject(altFindObjectsParametersCamera);
-
-                AltFindObjectsParameters closeButtonObjectsParameters = new AltFindObjectsParameters.Builder(
-                                AltDriver.By.NAME, "Close Button")
-                                .withCamera(AltDriver.By.ID, String.valueOf(camera.id))
-                                .build();
-                altDriver.findObject(closeButtonObjectsParameters).tap();
-
-                AltFindObjectsParameters buttonObjectsParameters = new AltFindObjectsParameters.Builder(
-                                AltDriver.By.NAME, "Button")
-                                .withCamera(AltDriver.By.ID, String.valueOf(camera.id))
-                                .build();
-                altDriver.findObject(buttonObjectsParameters).tap();
-
-                AltFindObjectsParameters panelObjectsParameters = new AltFindObjectsParameters.Builder(
-                                AltDriver.By.NAME, "Panel")
-                                .withCamera(AltDriver.By.ID, String.valueOf(camera.id))
-                                .build();
-                AltWaitForObjectsParameters panelWaitForObjectsParameters = new AltWaitForObjectsParameters.Builder(
-                                panelObjectsParameters).build();
-                AltObject panelElement = altDriver.waitForObject(panelWaitForObjectsParameters);
-
-                Assert.assertTrue(panelElement.isEnabled());
-        }
+    private static AltDriver altDriver;
+
+    @BeforeClass
+    public static void setUp() throws IOException {
+        AltPortForwarding.forwardAndroid();
+        altDriver = new AltDriver();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        altDriver.stop();
+        AltPortForwarding.removeForwardAndroid();
+    }
+
+    @Test
+    public void openClosePanelTest() {
+        altDriver.loadScene("Scene 2 Draggable Panel");
+
+        AltFindObjectsParameters altFindObjectsParametersCamera = new AltFindObjectsParameters.Builder(
+                AltDriver.By.PATH, "//Main Camera")
+                .build();
+        AltObject camera = altDriver.findObject(altFindObjectsParametersCamera);
+
+        AltFindObjectsParameters closeButtonObjectsParameters = new AltFindObjectsParameters.Builder(
+                AltDriver.By.NAME, "Close Button")
+                .withCamera(AltDriver.By.ID, String.valueOf(camera.id))
+                .build();
+        altDriver.findObject(closeButtonObjectsParameters).tap();
+
+        AltFindObjectsParameters buttonObjectsParameters = new AltFindObjectsParameters.Builder(
+                AltDriver.By.NAME, "Button")
+                .withCamera(AltDriver.By.ID, String.valueOf(camera.id))
+                .build();
+        altDriver.findObject(buttonObjectsParameters).tap();
+
+        AltFindObjectsParameters panelObjectsParameters = new AltFindObjectsParameters.Builder(
+                AltDriver.By.NAME, "Panel")
+                .withCamera(AltDriver.By.ID, String.valueOf(camera.id))
+                .build();
+        AltWaitForObjectsParameters panelWaitForObjectsParameters = new AltWaitForObjectsParameters.Builder(
+                panelObjectsParameters).build();
+        AltObject panelElement = altDriver.waitForObject(panelWaitForObjectsParameters);
+
+        Assert.assertTrue(panelElement.isEnabled());
+    }
 }
\ No newline at end of file
diff --git a/Docs/source/_static/examples~/common/python-ios-test.py b/Docs/source/_static/examples~/common/python-ios-test.py
index 07eac873e..5035d5195 100644
--- a/Docs/source/_static/examples~/common/python-ios-test.py
+++ b/Docs/source/_static/examples~/common/python-ios-test.py
@@ -4,7 +4,6 @@
 
 
 class MyFirstTest(unittest.TestCase):
-
     altdriver = None
 
     @classmethod
diff --git a/Docs/source/_static/examples~/get-started/csharp-test.cs b/Docs/source/_static/examples~/get-started/csharp-test.cs
index 8094f4d94..aedce1ec2 100644
--- a/Docs/source/_static/examples~/get-started/csharp-test.cs
+++ b/Docs/source/_static/examples~/get-started/csharp-test.cs
@@ -1,31 +1,31 @@
 using NUnit.Framework;
-using Altom.AltDriver;
+using AltTester.AltDriver;
 
 public class MyFirstTest
 {
-  private AltDriver altDriver;
+    private AltDriver altDriver;
 
-  [OneTimeSetUp]
-  public void SetUp()
-  {
-    altDriver = new AltDriver();
-  }
+    [OneTimeSetUp]
+    public void SetUp()
+    {
+        altDriver = new AltDriver();
+    }
 
-  [OneTimeTearDown]
-  public void TearDown()
-  {
-    altDriver.Stop();
-  }
+    [OneTimeTearDown]
+    public void TearDown()
+    {
+        altDriver.Stop();
+    }
 
-  [Test]
-  public void TestStartGame()
-  {
-    altDriver.LoadScene("Scene 2 Draggable Panel");
+    [Test]
+    public void TestStartGame()
+    {
+        altDriver.LoadScene("Scene 2 Draggable Panel");
 
-    altDriver.FindObject(By.NAME, "Close Button").Tap();
-    altDriver.FindObject(By.NAME, "Button").Tap();
+        altDriver.FindObject(By.NAME, "Close Button").Tap();
+        altDriver.FindObject(By.NAME, "Button").Tap();
 
-    var panelElement = altDriver.WaitForObject(By.NAME, "Panel");
-    Assert.IsTrue(panelElement.enabled);
-  }
+        var panelElement = altDriver.WaitForObject(By.NAME, "Panel");
+        Assert.IsTrue(panelElement.enabled);
+    }
 }
diff --git a/Docs/source/pages/alttester-editor.md b/Docs/source/pages/alttester-editor.md
index 3a33ed466..e259a3ebb 100644
--- a/Docs/source/pages/alttester-editor.md
+++ b/Docs/source/pages/alttester-editor.md
@@ -138,15 +138,6 @@ You can also activate this option from within the test using the following code:
 - Add Scene: displays all the scenes in the project. User can add scenes to the "Scene Manager" from the "Add Scene" popup.
 - Action buttons (add / select / remove scenes).
 
-## Port Forwarding
-
-```eval_rst
-
-In this section you can setup :ref:`Port Forwarding <pages/advanced-usage:What is port forwarding and when to use it>`
-on your device. Your device needs to be connected to the computer through USB and you need to click the Refresh button in the section to view it in the list.
-
-```
-
 ## Build & Run Settings
 
 _Platform Settings_