diff --git a/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/%Org%.%Product%.Tests.IoT.csproj b/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/%Org%.%Product%.Tests.IoT.csproj
index a150820c1..38aab08b7 100644
--- a/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/%Org%.%Product%.Tests.IoT.csproj
+++ b/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/%Org%.%Product%.Tests.IoT.csproj
@@ -66,4 +66,11 @@
   <ItemGroup>
     <PackageReference Include="Cmf.Dev.Mes.TestScenarios" Version="<%= $CLI_PARAM_TestScenariosNugetVersion %>" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Cmf.ConnectIoT.TestOrchestrator.Core.LBOs" Version="*" />
+    <PackageReference Include="Cmf.ConnectIoT.TestOrchestrator.Core.Common" Version="*" />
+    <PackageReference Include="Cmf.ConnectIoT.TestOrchestrator.Core.ScenarioBuilder" Version="*" />
+    <PackageReference Include="Cmf.ConnectIoT.TestOrchestrator.Plugin.StartMode.Local" Version="*" />
+    <PackageReference Include="Cmf.ConnectIoT.TestOrchestrator.Plugin.System.MockSystem" Version="*" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/BaseContext.cs b/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/BaseContext.cs
index 248193fc3..1b09c73df 100644
--- a/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/BaseContext.cs
+++ b/cmf-cli/resources/template_feed/test/Tests.Package/%Org%.%Product%.Tests.IoT/BaseContext.cs
@@ -66,18 +66,6 @@ public static string UserName
             private set;
         }
 
-        /// <summary>
-        /// IoT Tests Mode
-        /// </summary>
-        /// <value>
-        /// Enum with modes
-        /// </value>
-        public static IoTModes Mode
-        {
-            get;
-            private set;
-        } = IoTModes.Local;
-
         /// <summary>
         /// Gets the user role.
         /// </summary>
@@ -147,27 +135,6 @@ public static void BaseInit(TestContext context)
 
             // Handle Culture
             CultureInfo.DefaultThreadCurrentCulture = new CultureInfo(GetString(context, "culture"));
-
-            #region Connect IoT
-
-            if (context.Properties.Contains("mode"))
-            {
-                IoTModes ioTMode;
-                Enum.TryParse(GetString(context, "mode"), out ioTMode);
-
-                Mode = ioTMode;
-            }
-
-            if (GetString(context, "TestRunDirectory").Contains("TestExecution"))
-            {
-                FilePath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), GetString(context, "filePathRemote")));
-            }
-            else
-            {
-                FilePath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), GetString(context, "filePathLocal")));
-            }
-
-            #endregion Connect IoT
         }
 
         /// <summary>
@@ -224,13 +191,6 @@ private static string GetString(TestContext context, string property)
             }
         }
 
-        public enum IoTModes
-        {
-            Local,
-            RemoteDownload,
-            RemoteService
-        }
-
         #endregion Private & Internal Methods
     }
 }