From: raycad <anh.vn@samsung.com>
Date: Tue, 4 Aug 2020 07:46:53 +0000 (+0700)
Subject: [Non-ACR][Template] Change template some packages of C# TCT from UI to Service
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F240185%2F3;p=test%2Ftct%2Fcsharp%2Fapi.git

[Non-ACR][Template] Change template some packages of C# TCT from UI to Service

Change-Id: I4a119457b0d94ae191777b51b48e37b867c2a548
---

diff --git a/tct-suite-vs/Tizen.Accounts.Tests/Program.cs b/tct-suite-vs/Tizen.Accounts.Tests/Program.cs
old mode 100644
new mode 100755
index 3df1d073a..9f05a0093
--- a/tct-suite-vs/Tizen.Accounts.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Accounts.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Accounts.Tests/Tizen.Accounts.Tests.csproj b/tct-suite-vs/Tizen.Accounts.Tests/Tizen.Accounts.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Accounts.Tests/Tizen.Accounts.Tests.csproj
+++ b/tct-suite-vs/Tizen.Accounts.Tests/Tizen.Accounts.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Accounts.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Accounts.Tests/tizen-manifest.xml
index 6a9cd0a92..c5afc0233 100755
--- a/tct-suite-vs/Tizen.Accounts.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Accounts.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Accounts.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Accounts.Tests" exec="Tizen.Accounts.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Accounts.Tests" exec="Tizen.Accounts.Tests.dll" type="dotnet">
         <icon>Tizen.Accounts.Tests.png</icon>
         <label>Tizen.Accounts.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <account>
         <account-provider appid="Tizen.Accounts.Tests" multiple-accounts-support="true" providerid="http://www.tizen.org">
diff --git a/tct-suite-vs/Tizen.Alarm.Tests/Program.cs b/tct-suite-vs/Tizen.Alarm.Tests/Program.cs
old mode 100644
new mode 100755
index 3df1d073a..9f05a0093
--- a/tct-suite-vs/Tizen.Alarm.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Alarm.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Alarm.Tests/Tizen.Alarm.Tests.csproj b/tct-suite-vs/Tizen.Alarm.Tests/Tizen.Alarm.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Alarm.Tests/Tizen.Alarm.Tests.csproj
+++ b/tct-suite-vs/Tizen.Alarm.Tests/Tizen.Alarm.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Alarm.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Alarm.Tests/tizen-manifest.xml
index 3a8815ea2..040d1d1a9 100755
--- a/tct-suite-vs/Tizen.Alarm.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Alarm.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Alarm.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Alarm.Tests" exec="Tizen.Alarm.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Alarm.Tests" exec="Tizen.Alarm.Tests.dll" type="dotnet">
         <icon>Tizen.Alarm.Tests.png</icon>
         <label>Tizen.Alarm.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/alarm.set</privilege>
diff --git a/tct-suite-vs/Tizen.Applications.ComponentBased.ComponentManager.Tests/Program.cs b/tct-suite-vs/Tizen.Applications.ComponentBased.ComponentManager.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.Applications.EventManager.Tests/Program.cs b/tct-suite-vs/Tizen.Applications.EventManager.Tests/Program.cs
index 7854c92d2..43ee5fe2d 100755
--- a/tct-suite-vs/Tizen.Applications.EventManager.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Applications.EventManager.Tests/Program.cs
@@ -16,37 +16,29 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tct-suite-vs/Tizen.Applications.EventManager.Tests/Tizen.Applications.EventManager.Tests.csproj b/tct-suite-vs/Tizen.Applications.EventManager.Tests/Tizen.Applications.EventManager.Tests.csproj
index 3a1ad009c..70f34a6d2 100755
--- a/tct-suite-vs/Tizen.Applications.EventManager.Tests/Tizen.Applications.EventManager.Tests.csproj
+++ b/tct-suite-vs/Tizen.Applications.EventManager.Tests/Tizen.Applications.EventManager.Tests.csproj
@@ -34,9 +34,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Applications.EventManager.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Applications.EventManager.Tests/tizen-manifest.xml
index 814fdf7b3..ef8af55b4 100755
--- a/tct-suite-vs/Tizen.Applications.EventManager.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Applications.EventManager.Tests/tizen-manifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Applications.EventManager.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Applications.EventManager.Tests" exec="Tizen.Applications.EventManager.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Applications.EventManager.Tests" exec="Tizen.Applications.EventManager.Tests.dll" type="dotnet">
         <icon>Tizen.ApplicationEvents.Tests.png</icon>
         <label>Tizen.Applications.EventManager.Tests</label>
         <background-category value="iot-communication" />
         <background-category value="location" />
         <background-category value="media" />
         <background-category value="sensor" />
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/display</privilege>
diff --git a/tct-suite-vs/Tizen.Applications.Tests/Program.cs b/tct-suite-vs/Tizen.Applications.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Applications.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Applications.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Applications.Tests/Tizen.Applications.Tests.csproj b/tct-suite-vs/Tizen.Applications.Tests/Tizen.Applications.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Applications.Tests/Tizen.Applications.Tests.csproj
+++ b/tct-suite-vs/Tizen.Applications.Tests/Tizen.Applications.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Applications.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Applications.Tests/tizen-manifest.xml
index 054b277ad..20b31c58d 100755
--- a/tct-suite-vs/Tizen.Applications.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Applications.Tests/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Applications.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Applications.Tests" exec="Tizen.Applications.Tests.dll" multiple="false" taskmanage="true" type="dotnet" splash-screen-display="true" launch_mode="single">
+    <service-application appid="Tizen.Applications.Tests" exec="Tizen.Applications.Tests.dll" type="dotnet">
         <icon>Tizen.Applications.Tests.png</icon>
         <label>Tizen.Applications.Tests</label>
         <background-category value="background-network" />
@@ -10,7 +10,7 @@
         <background-category value="media" />
         <background-category value="sensor" />
         <splash-screens />
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/Program.cs b/tct-suite-vs/Tizen.AudioIO.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.AudioIO.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.AudioIO.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/Tizen.AudioIO.Tests.csproj b/tct-suite-vs/Tizen.AudioIO.Tests/Tizen.AudioIO.Tests.csproj
index 0a96067bd..02e4552d2 100755
--- a/tct-suite-vs/Tizen.AudioIO.Tests/Tizen.AudioIO.Tests.csproj
+++ b/tct-suite-vs/Tizen.AudioIO.Tests/Tizen.AudioIO.Tests.csproj
@@ -32,10 +32,12 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.AudioIO.Tests/tizen-manifest.xml
index 4ee4d021e..fc1054809 100755
--- a/tct-suite-vs/Tizen.AudioIO.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.AudioIO.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.AudioIO.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.AudioIO.Tests"
-                    exec="Tizen.AudioIO.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.AudioIO.Tests.png</icon>
-    <label>Tizen.AudioIO.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.AudioIO.Tests" exec="Tizen.AudioIO.Tests.dll" type="dotnet">
+		<icon>Tizen.AudioIO.Tests.png</icon>
+		<label>Tizen.AudioIO.Tests</label>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/recorder</privilege>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/Program.cs b/tct-suite-vs/Tizen.Bluetooth.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/Tizen.Bluetooth.Tests.csproj b/tct-suite-vs/Tizen.Bluetooth.Tests/Tizen.Bluetooth.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/Tizen.Bluetooth.Tests.csproj
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/Tizen.Bluetooth.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Bluetooth.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Bluetooth.Tests/tizen-manifest.xml
index d7fa1ffc7..0cce170e9 100755
--- a/tct-suite-vs/Tizen.Bluetooth.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Bluetooth.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Bluetooth.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Bluetooth.Tests" exec="Tizen.Bluetooth.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Bluetooth.Tests" exec="Tizen.Bluetooth.Tests.dll" type="dotnet">
         <icon>Tizen.Bluetooth.Tests.png</icon>
         <label>Tizen.Bluetooth.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/network.get</privilege>
diff --git a/tct-suite-vs/Tizen.Calendar.Tests/Program.cs b/tct-suite-vs/Tizen.Calendar.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Calendar.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Calendar.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Calendar.Tests/Tizen.Calendar.Tests.csproj b/tct-suite-vs/Tizen.Calendar.Tests/Tizen.Calendar.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Calendar.Tests/Tizen.Calendar.Tests.csproj
+++ b/tct-suite-vs/Tizen.Calendar.Tests/Tizen.Calendar.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Calendar.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Calendar.Tests/tizen-manifest.xml
index b53e7bcaf..e3e5b17c0 100755
--- a/tct-suite-vs/Tizen.Calendar.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Calendar.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Calendar.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Calendar.Tests"
-                    exec="Tizen.Calendar.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Calendar.Tests" exec="Tizen.Calendar.Tests.dll" type="dotnet">
     <icon>Tizen.Calendar.Tests.png</icon>
     <label>Tizen.Calendar.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/calendar.read</privilege>
       <privilege>http://tizen.org/privilege/calendar.write</privilege>
diff --git a/tct-suite-vs/Tizen.Common.Tests/Program.cs b/tct-suite-vs/Tizen.Common.Tests/Program.cs
index 7b96ef139..43ee5fe2d 100755
--- a/tct-suite-vs/Tizen.Common.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Common.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Common.Tests/Tizen.Common.Tests.csproj b/tct-suite-vs/Tizen.Common.Tests/Tizen.Common.Tests.csproj
index b88b5f1f3..a21e521a2 100755
--- a/tct-suite-vs/Tizen.Common.Tests/Tizen.Common.Tests.csproj
+++ b/tct-suite-vs/Tizen.Common.Tests/Tizen.Common.Tests.csproj
@@ -32,9 +32,10 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
 </Project>
diff --git a/tct-suite-vs/Tizen.Common.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Common.Tests/tizen-manifest.xml
index c51972f2f..c81cc6a66 100755
--- a/tct-suite-vs/Tizen.Common.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Common.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Common.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Common.Tests" exec="Tizen.Common.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Common.Tests" exec="Tizen.Common.Tests.dll" type="dotnet">
         <label>Tizen.Common.Tests</label>
         <icon>Tizen.Common.Tests.png</icon>
-    </ui-application>
+    </service-application>
 	  <privileges>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.ComponentBased.Default.Tests/Program.cs b/tct-suite-vs/Tizen.ComponentBased.Default.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.ComponentBased.Manual.Tests/Program.cs b/tct-suite-vs/Tizen.ComponentBased.Manual.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.ComponentBased.Tests/Program.cs b/tct-suite-vs/Tizen.ComponentBased.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.Connection.Tests/Program.cs b/tct-suite-vs/Tizen.Connection.Tests/Program.cs
index 129489a65..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Connection.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Connection.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
 }
+
diff --git a/tct-suite-vs/Tizen.Connection.Tests/Tizen.Connection.Tests.csproj b/tct-suite-vs/Tizen.Connection.Tests/Tizen.Connection.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Connection.Tests/Tizen.Connection.Tests.csproj
+++ b/tct-suite-vs/Tizen.Connection.Tests/Tizen.Connection.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Connection.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Connection.Tests/tizen-manifest.xml
index 50e39c3c9..76287e076 100755
--- a/tct-suite-vs/Tizen.Connection.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Connection.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Connection.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Connection.Tests"
-                    exec="Tizen.Connection.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Connection.Tests" exec="Tizen.Connection.Tests.dll" type="dotnet">
     <icon>Tizen.Connection.Tests.png</icon>
     <label>Tizen.Connection.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
 		<privilege>http://tizen.org/privilege/network.get</privilege>
 		<privilege>http://tizen.org/privilege/network.set</privilege>
diff --git a/tct-suite-vs/Tizen.Contacts.Tests/Program.cs b/tct-suite-vs/Tizen.Contacts.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Contacts.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Contacts.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Contacts.Tests/Tizen.Contacts.Tests.csproj b/tct-suite-vs/Tizen.Contacts.Tests/Tizen.Contacts.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Contacts.Tests/Tizen.Contacts.Tests.csproj
+++ b/tct-suite-vs/Tizen.Contacts.Tests/Tizen.Contacts.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Contacts.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Contacts.Tests/tizen-manifest.xml
index 04b4d6efc..a4b25aa5a 100755
--- a/tct-suite-vs/Tizen.Contacts.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Contacts.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Contacts.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Contacts.Tests"
-                    exec="Tizen.Contacts.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Contacts.Tests" exec="Tizen.Contacts.Tests.dll" type="dotnet">
     <icon>Tizen.Contacts.Tests.png</icon>
     <label>Tizen.Contacts.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/contact.read</privilege>
       <privilege>http://tizen.org/privilege/contact.write</privilege>
diff --git a/tct-suite-vs/Tizen.Context.Tests/Program.cs b/tct-suite-vs/Tizen.Context.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Context.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Context.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Context.Tests/Tizen.Context.Tests.csproj b/tct-suite-vs/Tizen.Context.Tests/Tizen.Context.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Context.Tests/Tizen.Context.Tests.csproj
+++ b/tct-suite-vs/Tizen.Context.Tests/Tizen.Context.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Context.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Context.Tests/tizen-manifest.xml
index 3bccebf7a..0b1be2d8b 100755
--- a/tct-suite-vs/Tizen.Context.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Context.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Context.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Context.Tests" exec="Tizen.Context.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application  appid="Tizen.Context.Tests" exec="Tizen.Context.Tests.dll" type="dotnet">
         <icon>Tizen.Context.Tests.png</icon>
         <label>Tizen.Context.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/apphistory.read</privilege>
diff --git a/tct-suite-vs/Tizen.DataControl.Tests/Program.cs b/tct-suite-vs/Tizen.DataControl.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.DataControl.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.DataControl.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.DataControl.Tests/Tizen.DataControl.Tests.csproj b/tct-suite-vs/Tizen.DataControl.Tests/Tizen.DataControl.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.DataControl.Tests/Tizen.DataControl.Tests.csproj
+++ b/tct-suite-vs/Tizen.DataControl.Tests/Tizen.DataControl.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.DataControl.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.DataControl.Tests/tizen-manifest.xml
index 29a11fa4d..e3723be04 100755
--- a/tct-suite-vs/Tizen.DataControl.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.DataControl.Tests/tizen-manifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.DataControl.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.DataControl.Tests" exec="Tizen.DataControl.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.DataControl.Tests" exec="Tizen.DataControl.Tests.dll" type="dotnet">
         <icon>Tizen.DataControl.Tests.png</icon>
         <label>Tizen.DataControl.Tests</label>
         <datacontrol providerid="http://Tizen.DataControl.Tests.exe.com/datacontrol/provider/Tizen.DataControl.Tests.exe" access="ReadWrite" type="Sql" />
         <datacontrol providerid="http://Tizen.DataControl.Tests.exe.com/datacontrol/provider/Tizen.DataControl.Tests.exe" access="ReadWrite" type="Map" />
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/datasharing</privilege>
diff --git a/tct-suite-vs/Tizen.Device.Tests/Program.cs b/tct-suite-vs/Tizen.Device.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Device.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Device.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Device.Tests/Tizen.Device.Tests.csproj b/tct-suite-vs/Tizen.Device.Tests/Tizen.Device.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Device.Tests/Tizen.Device.Tests.csproj
+++ b/tct-suite-vs/Tizen.Device.Tests/Tizen.Device.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Device.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Device.Tests/tizen-manifest.xml
index a3f842ea1..72ffeebf5 100755
--- a/tct-suite-vs/Tizen.Device.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Device.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Device.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Device.Tests" exec="Tizen.Device.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Device.Tests" exec="Tizen.Device.Tests.dll" type="dotnet">
         <icon>Tizen.Device.Tests.png</icon>
         <label>Tizen.Device.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/haptic</privilege>
diff --git a/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Program.cs b/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Program.cs
index 7854c92d2..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
 }
+
diff --git a/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Tizen.DevicePolicyManager.Tests.csproj b/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Tizen.DevicePolicyManager.Tests.csproj
index 3da50a3d8..d4629cae6 100755
--- a/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Tizen.DevicePolicyManager.Tests.csproj
+++ b/tct-suite-vs/Tizen.DevicePolicyManager.Tests/Tizen.DevicePolicyManager.Tests.csproj
@@ -37,7 +37,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.DevicePolicyManager.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.DevicePolicyManager.Tests/tizen-manifest.xml
index 71bc8a3d1..2979e91df 100755
--- a/tct-suite-vs/Tizen.DevicePolicyManager.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.DevicePolicyManager.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.DevicePolicyManager.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.DevicePolicyManager.Tests"
-                    exec="Tizen.DevicePolicyManager.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.DevicePolicyManager.Tests" exec="Tizen.DevicePolicyManager.Tests.dll" type="dotnet">
     <icon>Tizen.DevicePolicyManager.Tests.png</icon>
     <label>Tizen.DevicePolicyManager.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.DotnetUtil.Tests/Program.cs b/tct-suite-vs/Tizen.DotnetUtil.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.DotnetUtil.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.DotnetUtil.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.DotnetUtil.Tests/Tizen.DotnetUtil.Tests.csproj b/tct-suite-vs/Tizen.DotnetUtil.Tests/Tizen.DotnetUtil.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.DotnetUtil.Tests/Tizen.DotnetUtil.Tests.csproj
+++ b/tct-suite-vs/Tizen.DotnetUtil.Tests/Tizen.DotnetUtil.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.DotnetUtil.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.DotnetUtil.Tests/tizen-manifest.xml
index 60de59743..13f7fc139 100755
--- a/tct-suite-vs/Tizen.DotnetUtil.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.DotnetUtil.Tests/tizen-manifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.DotnetUtil.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.DotnetUtil.Tests" exec="Tizen.DotnetUtil.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.DotnetUtil.Tests" exec="Tizen.DotnetUtil.Tests.dll" type="dotnet">
         <label>Tizen.DotnetUtil.Tests</label>
         <icon>Tizen.DotnetUtil.Tests.png</icon>
-    </ui-application>
-      <privileges>
+    </service-application>
+    <privileges>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
 </manifest>
diff --git a/tct-suite-vs/Tizen.Download.Tests/Program.cs b/tct-suite-vs/Tizen.Download.Tests/Program.cs
old mode 100644
new mode 100755
index 3df1d073a..9f05a0093
--- a/tct-suite-vs/Tizen.Download.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Download.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Download.Tests/Tizen.Download.Tests.csproj b/tct-suite-vs/Tizen.Download.Tests/Tizen.Download.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Download.Tests/Tizen.Download.Tests.csproj
+++ b/tct-suite-vs/Tizen.Download.Tests/Tizen.Download.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Download.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Download.Tests/tizen-manifest.xml
index aebac350b..484eb6e69 100755
--- a/tct-suite-vs/Tizen.Download.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Download.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Download.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Download.Tests" exec="Tizen.Download.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Download.Tests" exec="Tizen.Download.Tests.dll" type="dotnet">
         <icon>Tizen.Download.Tests.png</icon>
         <label>Tizen.Download.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/download</privilege>
diff --git a/tct-suite-vs/Tizen.Email.Tests/Program.cs b/tct-suite-vs/Tizen.Email.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Email.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Email.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Email.Tests/Tizen.Email.Tests.csproj b/tct-suite-vs/Tizen.Email.Tests/Tizen.Email.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Email.Tests/Tizen.Email.Tests.csproj
+++ b/tct-suite-vs/Tizen.Email.Tests/Tizen.Email.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Email.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Email.Tests/tizen-manifest.xml
index b021442a6..61b9d7708 100755
--- a/tct-suite-vs/Tizen.Email.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Email.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Email.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Email.Tests"
-                    exec="Tizen.Email.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.Email.Tests.png</icon>
-    <label>Tizen.Email.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.Email.Tests" exec="Tizen.Email.Tests.dll" type="dotnet">
+		<icon>Tizen.Email.Tests.png</icon>
+		<label>Tizen.Email.Tests</label>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/email</privilege>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Feedback.Tests/Program.cs b/tct-suite-vs/Tizen.Feedback.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Feedback.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Feedback.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Feedback.Tests/Tizen.Feedback.Tests.csproj b/tct-suite-vs/Tizen.Feedback.Tests/Tizen.Feedback.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Feedback.Tests/Tizen.Feedback.Tests.csproj
+++ b/tct-suite-vs/Tizen.Feedback.Tests/Tizen.Feedback.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Feedback.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Feedback.Tests/tizen-manifest.xml
index 43d160453..01ce7173e 100755
--- a/tct-suite-vs/Tizen.Feedback.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Feedback.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Feedback.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Feedback.Tests"
-        exec="Tizen.Feedback.Tests.dll"
-        type="dotnet"
-        multiple="false"
-        taskmanage="true"
-        launch_mode="single">
+  <service-application appid="Tizen.Feedback.Tests" exec="Tizen.Feedback.Tests.dll" type="dotnet">
   <icon>Tizen.Feedback.Tests.png</icon>
   <label>Tizen.Feedback.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/haptic</privilege>
diff --git a/tct-suite-vs/Tizen.FidoClient.Tests/Program.cs b/tct-suite-vs/Tizen.FidoClient.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.FidoClient.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.FidoClient.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.FidoClient.Tests/Tizen.FidoClient.Tests.csproj b/tct-suite-vs/Tizen.FidoClient.Tests/Tizen.FidoClient.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.FidoClient.Tests/Tizen.FidoClient.Tests.csproj
+++ b/tct-suite-vs/Tizen.FidoClient.Tests/Tizen.FidoClient.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.FidoClient.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.FidoClient.Tests/tizen-manifest.xml
index 66e124805..33ae0967d 100755
--- a/tct-suite-vs/Tizen.FidoClient.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.FidoClient.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.FidoClient.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.FidoClient.Tests"
-                    exec="Tizen.FidoClient.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.FidoClient.Tests.png</icon>
-    <label>Tizen.FidoClient.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.FidoClient.Tests" exec="Tizen.FidoClient.Tests.dll" type="dotnet">
+		<icon>Tizen.FidoClient.Tests.png</icon>
+		<label>Tizen.FidoClient.Tests</label>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/fido.client</privilege>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Geofence.Tests/Program.cs b/tct-suite-vs/Tizen.Geofence.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Geofence.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Geofence.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Geofence.Tests/Tizen.Geofence.Tests.csproj b/tct-suite-vs/Tizen.Geofence.Tests/Tizen.Geofence.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Geofence.Tests/Tizen.Geofence.Tests.csproj
+++ b/tct-suite-vs/Tizen.Geofence.Tests/Tizen.Geofence.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Geofence.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Geofence.Tests/tizen-manifest.xml
index bb6a914ea..f56d52209 100755
--- a/tct-suite-vs/Tizen.Geofence.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Geofence.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Geofence.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Geofence.Tests"
-                    exec="Tizen.Geofence.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.Geofence.Tests.png</icon>
-    <label>Tizen.Geofence.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.Geofence.Tests" exec="Tizen.Geofence.Tests.dll" type="dotnet">
+		<icon>Tizen.Geofence.Tests.png</icon>
+		<label>Tizen.Geofence.Tests</label>
+    </service-application>
     <privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
           <privilege>http://tizen.org/privilege/location</privilege>
diff --git a/tct-suite-vs/Tizen.Information.Tests/Program.cs b/tct-suite-vs/Tizen.Information.Tests/Program.cs
index 954119f19..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Information.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Information.Tests/Program.cs
@@ -1,51 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Information.Tests/Tizen.Information.Tests.csproj b/tct-suite-vs/Tizen.Information.Tests/Tizen.Information.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Information.Tests/Tizen.Information.Tests.csproj
+++ b/tct-suite-vs/Tizen.Information.Tests/Tizen.Information.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Information.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Information.Tests/tizen-manifest.xml
index 59da971e7..3989381b9 100755
--- a/tct-suite-vs/Tizen.Information.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Information.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Information.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Information.Tests"
-                  exec="Tizen.Information.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Information.Tests" exec="Tizen.Information.Tests.dll" type="dotnet">
     <icon>Tizen.Information.Tests.png</icon>
     <label>Tizen.Information.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/systemmonitor</privilege>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Inputmethod.Manual.Tests/Program.cs b/tct-suite-vs/Tizen.Inputmethod.Manual.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.Inputmethod.Tests/Tizen.Inputmethod.Tests.csproj b/tct-suite-vs/Tizen.Inputmethod.Tests/Tizen.Inputmethod.Tests.csproj
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Program.cs b/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Tizen.IoTConnectivityClient.Tests.csproj b/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Tizen.IoTConnectivityClient.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Tizen.IoTConnectivityClient.Tests.csproj
+++ b/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/Tizen.IoTConnectivityClient.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/tizen-manifest.xml
index 829b5adc4..156145713 100755
--- a/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.IoTConnectivityClient.Tests/tizen-manifest.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.IoTConnectivityClient.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.IoTConnectivityClient.Tests"
-                    exec="Tizen.IoTConnectivityClient.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.IoTConnectivityClient.Tests" exec="Tizen.IoTConnectivityClient.Tests.dll" type="dotnet">
     <icon>Tizen.IoTConnectivityClient.Tests.png</icon>
     <label>Tizen.IoTConnectivityClient.Tests</label>
     <background-category value="iot-communication"/>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/network.get</privilege>
         <privilege>http://tizen.org/privilege/internet</privilege>
diff --git a/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Program.cs b/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Tizen.IoTConnectivityServer.Tests.csproj b/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Tizen.IoTConnectivityServer.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Tizen.IoTConnectivityServer.Tests.csproj
+++ b/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/Tizen.IoTConnectivityServer.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/tizen-manifest.xml
index c2f433683..128b6882f 100755
--- a/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.IoTConnectivityServer.Tests/tizen-manifest.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.IoTConnectivityServer.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.IoTConnectivityServer.Tests"
-                    exec="Tizen.IoTConnectivityServer.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.IoTConnectivityServer.Tests" exec="Tizen.IoTConnectivityServer.Tests.dll" type="dotnet">
     <icon>Tizen.IoTConnectivityServer.Tests.png</icon>
     <label>Tizen.IoTConnectivityServer.Tests</label>
     <background-category value="iot-communication"/>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/network.get</privilege>
         <privilege>http://tizen.org/privilege/internet</privilege>
diff --git a/tct-suite-vs/Tizen.Log.Tests/Program.cs b/tct-suite-vs/Tizen.Log.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Log.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Log.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Log.Tests/Tizen.Log.Tests.csproj b/tct-suite-vs/Tizen.Log.Tests/Tizen.Log.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Log.Tests/Tizen.Log.Tests.csproj
+++ b/tct-suite-vs/Tizen.Log.Tests/Tizen.Log.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Log.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Log.Tests/tizen-manifest.xml
index a9a80f2b0..c917a37a3 100755
--- a/tct-suite-vs/Tizen.Log.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Log.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Log.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Log.Tests" exec="Tizen.Log.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Log.Tests" exec="Tizen.Log.Tests.dll" type="dotnet">
         <icon>Tizen.Log.Tests.png</icon>
         <label>Tizen.Log.Tests</label>
-    </ui-application>
+    </service-application>
     <shortcut-list />
   <privileges>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Program.cs b/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Program.cs
index 7854c92d2..a05c59b1c 100755
--- a/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Tizen.MachineLearning.Inference.Tests.csproj b/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Tizen.MachineLearning.Inference.Tests.csproj
index 358065323..c53c66ed4 100755
--- a/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Tizen.MachineLearning.Inference.Tests.csproj
+++ b/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/Tizen.MachineLearning.Inference.Tests.csproj
@@ -33,9 +33,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/tizen-manifest.xml
index 578ecba7a..f4bc97f49 100755
--- a/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MachineLearning.Inference.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.MachineLearning.Inference.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.MachineLearning.Inference.Tests"
-                    exec="Tizen.MachineLearning.Inference.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.MachineLearning.Inference.Tests.png</icon>
-    <label>Tizen.MachineLearning.Inference.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.MachineLearning.Inference.Tests" exec="Tizen.MachineLearning.Inference.Tests.dll" type="dotnet">
+		<icon>Tizen.MachineLearning.Inference.Tests.png</icon>
+		<label>Tizen.MachineLearning.Inference.Tests</label>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/Program.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.MediaCodec.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MediaCodec.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/Tizen.MediaCodec.Tests.csproj b/tct-suite-vs/Tizen.MediaCodec.Tests/Tizen.MediaCodec.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.MediaCodec.Tests/Tizen.MediaCodec.Tests.csproj
+++ b/tct-suite-vs/Tizen.MediaCodec.Tests/Tizen.MediaCodec.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MediaCodec.Tests/tizen-manifest.xml
index 82a9e57d6..df6a80d77 100755
--- a/tct-suite-vs/Tizen.MediaCodec.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MediaCodec.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.MediaCodec.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.MediaCodec.Tests"
-                    exec="Tizen.MediaCodec.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.MediaCodec.Tests.png</icon>
-    <label>Tizen.MediaCodec.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.MediaCodec.Tests" exec="Tizen.MediaCodec.Tests.dll" type="dotnet">
+		<icon>Tizen.MediaCodec.Tests.png</icon>
+		<label>Tizen.MediaCodec.Tests</label>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.MediaController.Tests/Program.cs b/tct-suite-vs/Tizen.MediaController.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.MediaController.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MediaController.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.MediaController.Tests/Tizen.MediaController.Tests.csproj b/tct-suite-vs/Tizen.MediaController.Tests/Tizen.MediaController.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.MediaController.Tests/Tizen.MediaController.Tests.csproj
+++ b/tct-suite-vs/Tizen.MediaController.Tests/Tizen.MediaController.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.MediaController.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MediaController.Tests/tizen-manifest.xml
index b9300d5ad..c2432f357 100755
--- a/tct-suite-vs/Tizen.MediaController.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MediaController.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.MediaController.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.MediaController.Tests"
-                    exec="Tizen.MediaController.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.MediaController.Tests.png</icon>
-    <label>Tizen.MediaController.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.MediaController.Tests" exec="Tizen.MediaController.Tests.dll" type="dotnet">
+		<icon>Tizen.MediaController.Tests.png</icon>
+		<label>Tizen.MediaController.Tests</label>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/mediacontroller.client</privilege>
       <privilege>http://tizen.org/privilege/mediacontroller.server</privilege>
diff --git a/tct-suite-vs/Tizen.MediaKey.Tests/Program.cs b/tct-suite-vs/Tizen.MediaKey.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.MediaKey.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MediaKey.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.MediaKey.Tests/Tizen.MediaKey.Tests.csproj b/tct-suite-vs/Tizen.MediaKey.Tests/Tizen.MediaKey.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.MediaKey.Tests/Tizen.MediaKey.Tests.csproj
+++ b/tct-suite-vs/Tizen.MediaKey.Tests/Tizen.MediaKey.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.MediaKey.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MediaKey.Tests/tizen-manifest.xml
index eb253a936..e7beb6502 100755
--- a/tct-suite-vs/Tizen.MediaKey.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MediaKey.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.MediaKey.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.MediaKey.Tests" exec="Tizen.MediaKey.Tests.dll" type="dotnet" multiple="false" taskmanage="true" nodisplay="false">
+    <service-application appid="Tizen.MediaKey.Tests" exec="Tizen.MediaKey.Tests.dll" type="dotnet">
         <icon>icon.png</icon>
         <label>Tizen.MediaKey.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/Program.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.MediaPlayer.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/Tizen.MediaPlayer.Tests.csproj b/tct-suite-vs/Tizen.MediaPlayer.Tests/Tizen.MediaPlayer.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.MediaPlayer.Tests/Tizen.MediaPlayer.Tests.csproj
+++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/Tizen.MediaPlayer.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MediaPlayer.Tests/tizen-manifest.xml
index 42e43ec2f..27291d812 100755
--- a/tct-suite-vs/Tizen.MediaPlayer.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.MediaPlayer.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.MediaPlayer.Tests"
-                    exec="Tizen.MediaPlayer.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.MediaPlayer.Tests.png</icon>
-    <label>Tizen.MediaPlayer.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.MediaPlayer.Tests" exec="Tizen.MediaPlayer.Tests.dll" type="dotnet">
+		<icon>Tizen.MediaPlayer.Tests.png</icon>
+		<label>Tizen.MediaPlayer.Tests</label>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/internet</privilege>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/Program.cs b/tct-suite-vs/Tizen.MediaVision.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.MediaVision.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MediaVision.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/Tizen.MediaVision.Tests.csproj b/tct-suite-vs/Tizen.MediaVision.Tests/Tizen.MediaVision.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.MediaVision.Tests/Tizen.MediaVision.Tests.csproj
+++ b/tct-suite-vs/Tizen.MediaVision.Tests/Tizen.MediaVision.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MediaVision.Tests/tizen-manifest.xml
index 4807981cd..c9e183545 100755
--- a/tct-suite-vs/Tizen.MediaVision.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MediaVision.Tests/tizen-manifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.MediaVision.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.MediaVision.Tests" exec="Tizen.MediaVision.Tests.dll" multiple="false" taskmanage="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.MediaVision.Tests" exec="Tizen.MediaVision.Tests.dll" type="dotnet">
         <icon>Tizen.MediaVision.Tests.png</icon>
         <label>Tizen.MediaVision.Tests</label>
         <splash-screens />
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/mediastorage</privilege>
diff --git a/tct-suite-vs/Tizen.Mediacontent.Tests/Program.cs b/tct-suite-vs/Tizen.Mediacontent.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Mediacontent.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Mediacontent.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Mediacontent.Tests/Tizen.Mediacontent.Tests.csproj b/tct-suite-vs/Tizen.Mediacontent.Tests/Tizen.Mediacontent.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Mediacontent.Tests/Tizen.Mediacontent.Tests.csproj
+++ b/tct-suite-vs/Tizen.Mediacontent.Tests/Tizen.Mediacontent.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Mediacontent.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Mediacontent.Tests/tizen-manifest.xml
index c11a32175..d9d0d70d0 100755
--- a/tct-suite-vs/Tizen.Mediacontent.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Mediacontent.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Mediacontent.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Mediacontent.Tests"
-                  exec="Tizen.Mediacontent.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Mediacontent.Tests" exec="Tizen.Mediacontent.Tests.dll" type="dotnet">
     <icon>Tizen.Mediacontent.Tests.png</icon>
     <label>Tizen.Mediacontent.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/content.write</privilege>
     <privilege>http://tizen.org/privilege/mediastorage</privilege>
diff --git a/tct-suite-vs/Tizen.Messages.Tests/Program.cs b/tct-suite-vs/Tizen.Messages.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Messages.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Messages.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Messages.Tests/Tizen.Messages.Tests.csproj b/tct-suite-vs/Tizen.Messages.Tests/Tizen.Messages.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Messages.Tests/Tizen.Messages.Tests.csproj
+++ b/tct-suite-vs/Tizen.Messages.Tests/Tizen.Messages.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Messages.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Messages.Tests/tizen-manifest.xml
index b2915decc..c31f5515a 100755
--- a/tct-suite-vs/Tizen.Messages.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Messages.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Messages.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Messages.Tests"
-                    exec="Tizen.Messages.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.Messages.Tests.png</icon>
-    <label>Tizen.Messages.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.Messages.Tests" exec="Tizen.Messages.Tests.dll" type="dotnet">
+		<icon>Tizen.Messages.Tests.png</icon>
+		<label>Tizen.Messages.Tests</label>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/message.read</privilege>
         <privilege>http://tizen.org/privilege/message.write</privilege>
diff --git a/tct-suite-vs/Tizen.Metadata.Tests/Program.cs b/tct-suite-vs/Tizen.Metadata.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Metadata.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Metadata.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Metadata.Tests/Tizen.Metadata.Tests.csproj b/tct-suite-vs/Tizen.Metadata.Tests/Tizen.Metadata.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.Metadata.Tests/Tizen.Metadata.Tests.csproj
+++ b/tct-suite-vs/Tizen.Metadata.Tests/Tizen.Metadata.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.Metadata.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Metadata.Tests/tizen-manifest.xml
index 5595124f5..f613e2bee 100755
--- a/tct-suite-vs/Tizen.Metadata.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Metadata.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Metadata.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Metadata.Tests"
-                    exec="Tizen.Metadata.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.Metadata.Tests.png</icon>
-    <label>Tizen.Metadata.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.Metadata.Tests" exec="Tizen.Metadata.Tests.dll" type="dotnet">
+		<icon>Tizen.Metadata.Tests.png</icon>
+		<label>Tizen.Metadata.Tests</label>
+    </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
   </privileges>
diff --git a/tct-suite-vs/Tizen.Mime.Tests/Program.cs b/tct-suite-vs/Tizen.Mime.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Mime.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Mime.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Mime.Tests/Tizen.Mime.Tests.csproj b/tct-suite-vs/Tizen.Mime.Tests/Tizen.Mime.Tests.csproj
index b88b5f1f3..200380f10 100755
--- a/tct-suite-vs/Tizen.Mime.Tests/Tizen.Mime.Tests.csproj
+++ b/tct-suite-vs/Tizen.Mime.Tests/Tizen.Mime.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Mime.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Mime.Tests/tizen-manifest.xml
index 5592e0b19..6b7b4271a 100755
--- a/tct-suite-vs/Tizen.Mime.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Mime.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Mime.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Mime.Tests"
-                  exec="Tizen.Mime.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Mime.Tests" exec="Tizen.Mime.Tests.dll" type="dotnet">
     <icon>Tizen.Mime.Tests.png</icon>
     <label>Tizen.Mime.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
   </privileges>
diff --git a/tct-suite-vs/Tizen.Multimedia.Tests/Program.cs b/tct-suite-vs/Tizen.Multimedia.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Multimedia.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Multimedia.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Multimedia.Tests/Tizen.Multimedia.Tests.csproj b/tct-suite-vs/Tizen.Multimedia.Tests/Tizen.Multimedia.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.Multimedia.Tests/Tizen.Multimedia.Tests.csproj
+++ b/tct-suite-vs/Tizen.Multimedia.Tests/Tizen.Multimedia.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.Multimedia.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Multimedia.Tests/tizen-manifest.xml
index bfcbc0284..574d5c6ae 100755
--- a/tct-suite-vs/Tizen.Multimedia.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Multimedia.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Multimedia.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Multimedia.Tests"
-                  exec="Tizen.Multimedia.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Multimedia.Tests" exec="Tizen.Multimedia.Tests.dll" type="dotnet">
     <icon>Tizen.Multimedia.Tests.png</icon>
     <label>Tizen.Multimedia.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/volume.set</privilege>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Multimedia.UI.Tests/Program.cs b/tct-suite-vs/Tizen.Multimedia.UI.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.Multimedia.UI.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Multimedia.UI.Tests/tizen-manifest.xml
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.MultimediaUtil.Tests/Program.cs b/tct-suite-vs/Tizen.MultimediaUtil.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.MultimediaUtil.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.MultimediaUtil.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.MultimediaUtil.Tests/Tizen.MultimediaUtil.Tests.csproj b/tct-suite-vs/Tizen.MultimediaUtil.Tests/Tizen.MultimediaUtil.Tests.csproj
index 2c5ba9ff7..e8f051745 100755
--- a/tct-suite-vs/Tizen.MultimediaUtil.Tests/Tizen.MultimediaUtil.Tests.csproj
+++ b/tct-suite-vs/Tizen.MultimediaUtil.Tests/Tizen.MultimediaUtil.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.MultimediaUtil.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.MultimediaUtil.Tests/tizen-manifest.xml
index b0b2409f4..4ee18b7d0 100755
--- a/tct-suite-vs/Tizen.MultimediaUtil.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.MultimediaUtil.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.MultimediaUtil.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.MultimediaUtil.Tests"
-                    exec="Tizen.MultimediaUtil.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.MultimediaUtil.Tests" exec="Tizen.MultimediaUtil.Tests.dll" type="dotnet">
     <icon>Tizen.MultimediaUtil.Tests.png</icon>
     <label>Tizen.MultimediaUtil.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.NUI.Components.Tests/Tizen.NUI.Components.Tests.csproj b/tct-suite-vs/Tizen.NUI.Components.Tests/Tizen.NUI.Components.Tests.csproj
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.Network.Stc.Tests/Program.cs b/tct-suite-vs/Tizen.Network.Stc.Tests/Program.cs
index 7854c92d2..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Network.Stc.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Network.Stc.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
 }
+
diff --git a/tct-suite-vs/Tizen.Network.Stc.Tests/Tizen.Network.Stc.Tests.csproj b/tct-suite-vs/Tizen.Network.Stc.Tests/Tizen.Network.Stc.Tests.csproj
index 26aa21c40..3d3a439f2 100755
--- a/tct-suite-vs/Tizen.Network.Stc.Tests/Tizen.Network.Stc.Tests.csproj
+++ b/tct-suite-vs/Tizen.Network.Stc.Tests/Tizen.Network.Stc.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Network.Stc.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Network.Stc.Tests/tizen-manifest.xml
index 07161c2f2..031d8a875 100755
--- a/tct-suite-vs/Tizen.Network.Stc.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Network.Stc.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Network.Stc.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Network.Stc.Tests"
-                    exec="Tizen.Network.Stc.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Network.Stc.Tests" exec="Tizen.Network.Stc.Tests.dll" type="dotnet">
     <icon>Tizen.Network.Stc.Tests.png</icon>
     <label>Tizen.Network.Stc.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/network.get</privilege>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Nfc.Tests/Program.cs b/tct-suite-vs/Tizen.Nfc.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Nfc.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Nfc.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Nfc.Tests/Tizen.Nfc.Tests.csproj b/tct-suite-vs/Tizen.Nfc.Tests/Tizen.Nfc.Tests.csproj
index b88b5f1f3..9891b79c1 100755
--- a/tct-suite-vs/Tizen.Nfc.Tests/Tizen.Nfc.Tests.csproj
+++ b/tct-suite-vs/Tizen.Nfc.Tests/Tizen.Nfc.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Nfc.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Nfc.Tests/tizen-manifest.xml
index 409ccd29a..2c80eb0e4 100755
--- a/tct-suite-vs/Tizen.Nfc.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Nfc.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Nfc.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Nfc.Tests"
-                    exec="Tizen.Nfc.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Nfc.Tests" exec="Tizen.Nfc.Tests.dll" type="dotnet">
     <icon>Tizen.Nfc.Tests.png</icon>
     <label>Tizen.Nfc.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/nfc</privilege>
         <privilege>http://tizen.org/privilege/nfc.cardemulation</privilege>
diff --git a/tct-suite-vs/Tizen.Nlp.Tests/Program.cs b/tct-suite-vs/Tizen.Nlp.Tests/Program.cs
index 129489a65..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Nlp.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Nlp.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
 }
+
diff --git a/tct-suite-vs/Tizen.Nlp.Tests/Tizen.Nlp.Tests.csproj b/tct-suite-vs/Tizen.Nlp.Tests/Tizen.Nlp.Tests.csproj
index b6180c7b9..5ad7a8f80 100755
--- a/tct-suite-vs/Tizen.Nlp.Tests/Tizen.Nlp.Tests.csproj
+++ b/tct-suite-vs/Tizen.Nlp.Tests/Tizen.Nlp.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Nlp.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Nlp.Tests/tizen-manifest.xml
index c9bdfa84f..9b45d9387 100755
--- a/tct-suite-vs/Tizen.Nlp.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Nlp.Tests/tizen-manifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Nlp.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
-    <ui-application appid="Tizen.Nlp.Tests" exec="Tizen.Nlp.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <service-application appid="Tizen.Nlp.Tests" exec="Tizen.Nlp.Tests.dll" type="dotnet">
         <icon>Tizen.Nlp.Tests.png</icon>
         <label>Tizen.Nlp.Tests</label>
         <splash-screens />
-    </ui-application>
+    </service-application>
     <shortcut-list />
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Nsd.Tests/Program.cs b/tct-suite-vs/Tizen.Nsd.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Nsd.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Nsd.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Nsd.Tests/Tizen.Nsd.Tests.csproj b/tct-suite-vs/Tizen.Nsd.Tests/Tizen.Nsd.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Nsd.Tests/Tizen.Nsd.Tests.csproj
+++ b/tct-suite-vs/Tizen.Nsd.Tests/Tizen.Nsd.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Nsd.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Nsd.Tests/tizen-manifest.xml
index 95e78e5ad..8d3e969d6 100755
--- a/tct-suite-vs/Tizen.Nsd.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Nsd.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Nsd.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Nsd.Tests"
-                    exec="Tizen.Nsd.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Nsd.Tests" exec="Tizen.Nsd.Tests.dll" type="dotnet">
     <icon>Tizen.Nsd.Tests.png</icon>
     <label>Tizen.Nsd.Tests</label>
-    </ui-application>
+    </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/internet</privilege>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.OAuth2.Tests/Program.cs b/tct-suite-vs/Tizen.OAuth2.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.OAuth2.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.OAuth2.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.OAuth2.Tests/Tizen.OAuth2.Tests.csproj b/tct-suite-vs/Tizen.OAuth2.Tests/Tizen.OAuth2.Tests.csproj
index f837ac3bf..31aa7d983 100755
--- a/tct-suite-vs/Tizen.OAuth2.Tests/Tizen.OAuth2.Tests.csproj
+++ b/tct-suite-vs/Tizen.OAuth2.Tests/Tizen.OAuth2.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
-  <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+ <ItemGroup>
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.OAuth2.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.OAuth2.Tests/tizen-manifest.xml
index da6db96f2..ba72a6628 100755
--- a/tct-suite-vs/Tizen.OAuth2.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.OAuth2.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.OAuth2.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.OAuth2.Tests"
-                    exec="Tizen.OAuth2.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.OAuth2.Tests.png</icon>
-    <label>Tizen.OAuth2.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.OAuth2.Tests" exec="Tizen.OAuth2.Tests.dll" type="dotnet">
+		<icon>Tizen.OAuth2.Tests.png</icon>
+		<label>Tizen.OAuth2.Tests</label>
+    </service-application>
     <privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
           <privilege>http://tizen.org/privilege/internet</privilege>
diff --git a/tct-suite-vs/Tizen.Packagemanager.Tests/Program.cs b/tct-suite-vs/Tizen.Packagemanager.Tests/Program.cs
index 3df1d073a..fe9f7c736 100755
--- a/tct-suite-vs/Tizen.Packagemanager.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Packagemanager.Tests/Program.cs
@@ -13,39 +13,30 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Packagemanager.Tests/Tizen.Packagemanager.Tests.csproj b/tct-suite-vs/Tizen.Packagemanager.Tests/Tizen.Packagemanager.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.Packagemanager.Tests/Tizen.Packagemanager.Tests.csproj
+++ b/tct-suite-vs/Tizen.Packagemanager.Tests/Tizen.Packagemanager.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Packagemanager.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Packagemanager.Tests/tizen-manifest.xml
index 861b7c6e9..b085aa7f9 100755
--- a/tct-suite-vs/Tizen.Packagemanager.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Packagemanager.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Packagemanager.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Packagemanager.Tests"
-                  exec="Tizen.Packagemanager.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Packagemanager.Tests" exec="Tizen.Packagemanager.Tests.dll" type="dotnet">
     <icon>Tizen.Packagemanager.Tests.png</icon>
     <label>Tizen.Packagemanager.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
     <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
diff --git a/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Program.cs b/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Tizen.PhonenumberUtils.Tests.csproj b/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Tizen.PhonenumberUtils.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Tizen.PhonenumberUtils.Tests.csproj
+++ b/tct-suite-vs/Tizen.PhonenumberUtils.Tests/Tizen.PhonenumberUtils.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.PhonenumberUtils.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.PhonenumberUtils.Tests/tizen-manifest.xml
index 55164fa30..159e7ccf0 100755
--- a/tct-suite-vs/Tizen.PhonenumberUtils.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.PhonenumberUtils.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.PhonenumberUtils.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.PhonenumberUtils.Tests"
-                    exec="Tizen.PhonenumberUtils.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.PhonenumberUtils.Tests" exec="Tizen.PhonenumberUtils.Tests.dll" type="dotnet">
     <icon>Tizen.PhonenumberUtils.Tests.png</icon>
     <label>Tizen.PhonenumberUtils.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/telephony</privilege>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.PrivacyPrivilegeManager.Manual.Tests/Program.cs b/tct-suite-vs/Tizen.PrivacyPrivilegeManager.Manual.Tests/Program.cs
old mode 100644
new mode 100755
diff --git a/tct-suite-vs/Tizen.Privilege.Tests/Program.cs b/tct-suite-vs/Tizen.Privilege.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Privilege.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Privilege.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Privilege.Tests/Tizen.Privilege.Tests.csproj b/tct-suite-vs/Tizen.Privilege.Tests/Tizen.Privilege.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Privilege.Tests/Tizen.Privilege.Tests.csproj
+++ b/tct-suite-vs/Tizen.Privilege.Tests/Tizen.Privilege.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Privilege.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Privilege.Tests/tizen-manifest.xml
index e93d2795a..0b2679c7f 100755
--- a/tct-suite-vs/Tizen.Privilege.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Privilege.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Privilege.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Privilege.Tests"
-                    exec="Tizen.Privilege.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Privilege.Tests" exec="Tizen.Privilege.Tests.dll" type="dotnet">
     <icon>Tizen.Privilege.Tests.png</icon>
     <label>Tizen.Privilege.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/account.read</privilege>
         <privilege>http://tizen.org/privilege/contact.read</privilege>
diff --git a/tct-suite-vs/Tizen.Push.Tests/Program.cs b/tct-suite-vs/Tizen.Push.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Push.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Push.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Push.Tests/Tizen.Push.Tests.csproj b/tct-suite-vs/Tizen.Push.Tests/Tizen.Push.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.Push.Tests/Tizen.Push.Tests.csproj
+++ b/tct-suite-vs/Tizen.Push.Tests/Tizen.Push.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Push.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Push.Tests/tizen-manifest.xml
index b5711f50f..1c693d022 100755
--- a/tct-suite-vs/Tizen.Push.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Push.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Push.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Push.Tests"
-                  exec="Tizen.Push.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Push.Tests" exec="Tizen.Push.Tests.dll" type="dotnet">
     <icon>Tizen.Push.Tests.png</icon>
     <label>Tizen.Push.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/push</privilege>
     <privilege>http://tizen.org/privilege/internet</privilege>
diff --git a/tct-suite-vs/Tizen.Radio.Tests/Program.cs b/tct-suite-vs/Tizen.Radio.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Radio.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Radio.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Radio.Tests/Tizen.Radio.Tests.csproj b/tct-suite-vs/Tizen.Radio.Tests/Tizen.Radio.Tests.csproj
index 0a96067bd..57155e40b 100755
--- a/tct-suite-vs/Tizen.Radio.Tests/Tizen.Radio.Tests.csproj
+++ b/tct-suite-vs/Tizen.Radio.Tests/Tizen.Radio.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.Radio.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Radio.Tests/tizen-manifest.xml
index 44bd59bb5..bc1a94654 100755
--- a/tct-suite-vs/Tizen.Radio.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Radio.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Radio.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Radio.Tests"
-                    exec="Tizen.Radio.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.Radio.Tests.png</icon>
-    <label>Tizen.Radio.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.Radio.Tests" exec="Tizen.Radio.Tests.dll" type="dotnet">
+		<icon>Tizen.Radio.Tests.png</icon>
+		<label>Tizen.Radio.Tests</label>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.Recorder.Tests/Program.cs b/tct-suite-vs/Tizen.Recorder.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Recorder.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Recorder.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Recorder.Tests/Tizen.Recorder.Tests.csproj b/tct-suite-vs/Tizen.Recorder.Tests/Tizen.Recorder.Tests.csproj
index 0a96067bd..57155e40b 100755
--- a/tct-suite-vs/Tizen.Recorder.Tests/Tizen.Recorder.Tests.csproj
+++ b/tct-suite-vs/Tizen.Recorder.Tests/Tizen.Recorder.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.Recorder.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Recorder.Tests/tizen-manifest.xml
index d3fcb49ba..bafb22a2f 100755
--- a/tct-suite-vs/Tizen.Recorder.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Recorder.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Recorder.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Recorder.Tests"
-                    exec="Tizen.Recorder.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.Recorder.Tests.png</icon>
-    <label>Tizen.Recorder.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.Recorder.Tests" exec="Tizen.Recorder.Tests.dll" type="dotnet">
+		<icon>Tizen.Recorder.Tests.png</icon>
+		<label>Tizen.Recorder.Tests</label>
+    </service-application>
     <privileges>
       <privilege>http://tizen.org/privilege/recorder</privilege>
       <privilege>http://tizen.org/privilege/camera</privilege>
diff --git a/tct-suite-vs/Tizen.ScreenMirroring.Tests/Program.cs b/tct-suite-vs/Tizen.ScreenMirroring.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.ScreenMirroring.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.ScreenMirroring.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.ScreenMirroring.Tests/Tizen.ScreenMirroring.Tests.csproj b/tct-suite-vs/Tizen.ScreenMirroring.Tests/Tizen.ScreenMirroring.Tests.csproj
index 0a96067bd..57155e40b 100755
--- a/tct-suite-vs/Tizen.ScreenMirroring.Tests/Tizen.ScreenMirroring.Tests.csproj
+++ b/tct-suite-vs/Tizen.ScreenMirroring.Tests/Tizen.ScreenMirroring.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.ScreenMirroring.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.ScreenMirroring.Tests/tizen-manifest.xml
index 87fbe1a0e..a7484d7b6 100755
--- a/tct-suite-vs/Tizen.ScreenMirroring.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.ScreenMirroring.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.ScreenMirroring.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.ScreenMirroring.Tests"
-                    exec="Tizen.ScreenMirroring.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.ScreenMirroring.Tests.png</icon>
-    <label>Tizen.ScreenMirroring.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.ScreenMirroring.Tests" exec="Tizen.ScreenMirroring.Tests.dll" type="dotnet">
+		<icon>Tizen.ScreenMirroring.Tests.png</icon>
+		<label>Tizen.ScreenMirroring.Tests</label>
+    </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
   </privileges>
diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/Program.cs b/tct-suite-vs/Tizen.Securerepository.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Securerepository.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Securerepository.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/Tizen.Securerepository.Tests.csproj b/tct-suite-vs/Tizen.Securerepository.Tests/Tizen.Securerepository.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Securerepository.Tests/Tizen.Securerepository.Tests.csproj
+++ b/tct-suite-vs/Tizen.Securerepository.Tests/Tizen.Securerepository.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Securerepository.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Securerepository.Tests/tizen-manifest.xml
index 491d73fb9..9fb6b37af 100755
--- a/tct-suite-vs/Tizen.Securerepository.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Securerepository.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Securerepository.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Securerepository.Tests"
-                    exec="Tizen.Securerepository.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Securerepository.Tests" exec="Tizen.Securerepository.Tests.dll" type="dotnet">
     <icon>Tizen.Securerepository.Tests.png</icon>
     <label>Tizen.Securerepository.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/internet</privilege>
diff --git a/tct-suite-vs/Tizen.Sensor.Tests/Program.cs b/tct-suite-vs/Tizen.Sensor.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Sensor.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Sensor.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Sensor.Tests/Tizen.Sensor.Tests.csproj b/tct-suite-vs/Tizen.Sensor.Tests/Tizen.Sensor.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Sensor.Tests/Tizen.Sensor.Tests.csproj
+++ b/tct-suite-vs/Tizen.Sensor.Tests/Tizen.Sensor.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Sensor.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Sensor.Tests/tizen-manifest.xml
index d9b0293de..5666c5162 100755
--- a/tct-suite-vs/Tizen.Sensor.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Sensor.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Sensor.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Sensor.Tests"
-                  exec="Tizen.Sensor.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Sensor.Tests" exec="Tizen.Sensor.Tests.dll" type="dotnet">
     <icon>Tizen.Sensor.Tests.png</icon>
     <label>Tizen.Sensor.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/healthinfo</privilege>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Smartcard.Tests/Program.cs b/tct-suite-vs/Tizen.Smartcard.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Smartcard.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Smartcard.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Smartcard.Tests/Tizen.Smartcard.Tests.csproj b/tct-suite-vs/Tizen.Smartcard.Tests/Tizen.Smartcard.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Smartcard.Tests/Tizen.Smartcard.Tests.csproj
+++ b/tct-suite-vs/Tizen.Smartcard.Tests/Tizen.Smartcard.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Smartcard.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Smartcard.Tests/tizen-manifest.xml
index 7a992b37c..16ecf82bb 100755
--- a/tct-suite-vs/Tizen.Smartcard.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Smartcard.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Smartcard.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Smartcard.Tests"
-                    exec="Tizen.Smartcard.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Smartcard.Tests" exec="Tizen.Smartcard.Tests.dll" type="dotnet">
     <icon>Tizen.Smartcard.Tests.png</icon>
     <label>Tizen.Smartcard.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/secureelement</privilege>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.StreamRecorder.Tests/Program.cs b/tct-suite-vs/Tizen.StreamRecorder.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.StreamRecorder.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.StreamRecorder.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.StreamRecorder.Tests/Tizen.StreamRecorder.Tests.csproj b/tct-suite-vs/Tizen.StreamRecorder.Tests/Tizen.StreamRecorder.Tests.csproj
index 0a96067bd..57155e40b 100755
--- a/tct-suite-vs/Tizen.StreamRecorder.Tests/Tizen.StreamRecorder.Tests.csproj
+++ b/tct-suite-vs/Tizen.StreamRecorder.Tests/Tizen.StreamRecorder.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
     <ProjectReference Include="..\Tizen.Multimedia.Support.Library\Tizen.Multimedia.Support.Library.csproj" />
   </ItemGroup>
 
diff --git a/tct-suite-vs/Tizen.StreamRecorder.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.StreamRecorder.Tests/tizen-manifest.xml
index b455cece4..81279e415 100755
--- a/tct-suite-vs/Tizen.StreamRecorder.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.StreamRecorder.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.StreamRecorder.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.StreamRecorder.Tests"
-                    exec="Tizen.StreamRecorder.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.StreamRecorder.Tests" exec="Tizen.StreamRecorder.Tests.dll" type="dotnet">
     <icon>Tizen.StreamRecorder.Tests.png</icon>
     <label>Tizen.StreamRecorder.Tests</label>
-    </ui-application>
+    </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
   </privileges>
diff --git a/tct-suite-vs/Tizen.Stt.Tests/Program.cs b/tct-suite-vs/Tizen.Stt.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Stt.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Stt.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Stt.Tests/Tizen.Stt.Tests.csproj b/tct-suite-vs/Tizen.Stt.Tests/Tizen.Stt.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.Stt.Tests/Tizen.Stt.Tests.csproj
+++ b/tct-suite-vs/Tizen.Stt.Tests/Tizen.Stt.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Stt.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Stt.Tests/tizen-manifest.xml
index 6d72a368d..551ebe130 100755
--- a/tct-suite-vs/Tizen.Stt.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Stt.Tests/tizen-manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.Stt.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
   <profile name="common" />
-  <ui-application appid="Tizen.Stt.Tests" exec="Tizen.Stt.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+  <service-application appid="Tizen.Stt.Tests" exec="Tizen.Stt.Tests.dll" type="dotnet">
     <icon>Tizen.Stt.Tests.png</icon>
     <label>Tizen.Stt.Tests</label>
-  </ui-application>
+  </service-application>
   <shortcut-list />
   <privileges>
     <privilege>http://tizen.org/privilege/recorder</privilege>
diff --git a/tct-suite-vs/Tizen.SyncManager.Tests/Program.cs b/tct-suite-vs/Tizen.SyncManager.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.SyncManager.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.SyncManager.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.SyncManager.Tests/Tizen.SyncManager.Tests.csproj b/tct-suite-vs/Tizen.SyncManager.Tests/Tizen.SyncManager.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.SyncManager.Tests/Tizen.SyncManager.Tests.csproj
+++ b/tct-suite-vs/Tizen.SyncManager.Tests/Tizen.SyncManager.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.SyncManager.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.SyncManager.Tests/tizen-manifest.xml
index 5139c8bf0..4bf51f3ee 100755
--- a/tct-suite-vs/Tizen.SyncManager.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.SyncManager.Tests/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="Tizen.SyncManager.Tests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
   <profile name="common" />
-  <service-application appid="Tizen.SyncManager.Tests" exec="Tizen.SyncManager.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+  <service-application appid="Tizen.SyncManager.Tests" exec="Tizen.SyncManager.Tests.dll" type="dotnet">
     <icon>Tizen.SyncManager.Tests.png</icon>
     <label>Tizen.SyncManager.Tests</label>
   </service-application>
diff --git a/tct-suite-vs/Tizen.System.Tests/Program.cs b/tct-suite-vs/Tizen.System.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.System.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.System.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.System.Tests/Tizen.System.Tests.csproj b/tct-suite-vs/Tizen.System.Tests/Tizen.System.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.System.Tests/Tizen.System.Tests.csproj
+++ b/tct-suite-vs/Tizen.System.Tests/Tizen.System.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.System.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.System.Tests/tizen-manifest.xml
index 0c6d01998..2b7e4416e 100755
--- a/tct-suite-vs/Tizen.System.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.System.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.System.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.System.Tests"
-                  exec="Tizen.System.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.System.Tests" exec="Tizen.System.Tests.dll" type="dotnet">
     <icon>Tizen.System.Tests.png</icon>
     <label>Tizen.System.Tests</label>
-  </ui-application>
+  </service-application>
 	<privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         </privileges>
diff --git a/tct-suite-vs/Tizen.Systemsettings.Tests/Program.cs b/tct-suite-vs/Tizen.Systemsettings.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Systemsettings.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Systemsettings.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Systemsettings.Tests/Tizen.Systemsettings.Tests.csproj b/tct-suite-vs/Tizen.Systemsettings.Tests/Tizen.Systemsettings.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Systemsettings.Tests/Tizen.Systemsettings.Tests.csproj
+++ b/tct-suite-vs/Tizen.Systemsettings.Tests/Tizen.Systemsettings.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Systemsettings.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Systemsettings.Tests/tizen-manifest.xml
index 41aae1af6..49f38d818 100755
--- a/tct-suite-vs/Tizen.Systemsettings.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Systemsettings.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Systemsettings.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Systemsettings.Tests"
-                  exec="Tizen.Systemsettings.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Systemsettings.Tests" exec="Tizen.Systemsettings.Tests.dll" type="dotnet">
     <icon>Tizen.Systemsettings.Tests.png</icon>
     <label>Tizen.Systemsettings.Tests</label>
-  </ui-application>
+  </service-application>
 	<privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         </privileges>
diff --git a/tct-suite-vs/Tizen.TEEC.Tests/Program.cs b/tct-suite-vs/Tizen.TEEC.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.TEEC.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.TEEC.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.TEEC.Tests/Tizen.TEEC.Tests.csproj b/tct-suite-vs/Tizen.TEEC.Tests/Tizen.TEEC.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.TEEC.Tests/Tizen.TEEC.Tests.csproj
+++ b/tct-suite-vs/Tizen.TEEC.Tests/Tizen.TEEC.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.TEEC.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.TEEC.Tests/tizen-manifest.xml
index 3cef42881..0826a5e96 100755
--- a/tct-suite-vs/Tizen.TEEC.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.TEEC.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.TEEC.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.TEEC.Tests"
-                    exec="Tizen.TEEC.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.TEEC.Tests" exec="Tizen.TEEC.Tests.dll" type="dotnet">
     <icon>Tizen.TEEC.Tests.png</icon>
     <label>Tizen.TEEC.Tests</label>
-    </ui-application>
+    </service-application>
 	<privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         </privileges>
diff --git a/tct-suite-vs/Tizen.Telephony.Tests/Program.cs b/tct-suite-vs/Tizen.Telephony.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Telephony.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Telephony.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Telephony.Tests/Tizen.Telephony.Tests.csproj b/tct-suite-vs/Tizen.Telephony.Tests/Tizen.Telephony.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.Telephony.Tests/Tizen.Telephony.Tests.csproj
+++ b/tct-suite-vs/Tizen.Telephony.Tests/Tizen.Telephony.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Telephony.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Telephony.Tests/tizen-manifest.xml
index fe29a94cd..93143b2e2 100755
--- a/tct-suite-vs/Tizen.Telephony.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Telephony.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Telephony.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Telephony.Tests"
-                    exec="Tizen.Telephony.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Telephony.Tests" exec="Tizen.Telephony.Tests.dll" type="dotnet">
     <icon>Tizen.Telephony.Tests.png</icon>
     <label>Tizen.Telephony.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     <privilege>http://tizen.org/privilege/telephony</privilege>
diff --git a/tct-suite-vs/Tizen.ToastMessage.Tests/Program.cs b/tct-suite-vs/Tizen.ToastMessage.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.ToastMessage.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.ToastMessage.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.ToastMessage.Tests/Tizen.ToastMessage.Tests.csproj b/tct-suite-vs/Tizen.ToastMessage.Tests/Tizen.ToastMessage.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.ToastMessage.Tests/Tizen.ToastMessage.Tests.csproj
+++ b/tct-suite-vs/Tizen.ToastMessage.Tests/Tizen.ToastMessage.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.ToastMessage.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.ToastMessage.Tests/tizen-manifest.xml
index a35745e51..10f486cc2 100755
--- a/tct-suite-vs/Tizen.ToastMessage.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.ToastMessage.Tests/tizen-manifest.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.ToastMessage.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.ToastMessage.Tests"
-                    exec="Tizen.ToastMessage.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
-    <icon>Tizen.ToastMessage.Tests.png</icon>
-    <label>Tizen.ToastMessage.Tests</label>
-    </ui-application>
+    <service-application appid="Tizen.ToastMessage.Tests" exec="Tizen.ToastMessage.Tests.dll" type="dotnet">
+		<icon>Tizen.ToastMessage.Tests.png</icon>
+		<label>Tizen.ToastMessage.Tests</label>
+    </service-application>
 	<privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-        </privileges>
+    </privileges>
 </manifest>
diff --git a/tct-suite-vs/Tizen.Tracer.Tests/Program.cs b/tct-suite-vs/Tizen.Tracer.Tests/Program.cs
index 3df1d073a..9f05a0093 100755
--- a/tct-suite-vs/Tizen.Tracer.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Tracer.Tests/Program.cs
@@ -16,36 +16,28 @@
 
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/tct-suite-vs/Tizen.Tracer.Tests/Tizen.Tracer.Tests.csproj b/tct-suite-vs/Tizen.Tracer.Tests/Tizen.Tracer.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.Tracer.Tests/Tizen.Tracer.Tests.csproj
+++ b/tct-suite-vs/Tizen.Tracer.Tests/Tizen.Tracer.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Tracer.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Tracer.Tests/tizen-manifest.xml
index 86ba57eae..d158dee4f 100755
--- a/tct-suite-vs/Tizen.Tracer.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Tracer.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Tracer.Tests" version="1.0.0">
 	<profile name="common" />
-	<ui-application appid="Tizen.Tracer.Tests"
-					exec="Tizen.Tracer.Tests.dll"
-					type="dotnet"
-					multiple="false"
-					taskmanage="true"
-					launch_mode="single">
-	<icon>Tizen.Tracer.Tests.png</icon>
-	<label>Tizen.Tracer.Tests</label>
-	</ui-application>
+    <service-application appid="Tizen.Tracer.Tests" exec="Tizen.Tracer.Tests.dll" type="dotnet">
+		<icon>Tizen.Tracer.Tests.png</icon>
+		<label>Tizen.Tracer.Tests</label>
+    </service-application>
 	<privileges>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         </privileges>
diff --git a/tct-suite-vs/Tizen.Tts.Tests/Program.cs b/tct-suite-vs/Tizen.Tts.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Tts.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Tts.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Tts.Tests/Tizen.Tts.Tests.csproj b/tct-suite-vs/Tizen.Tts.Tests/Tizen.Tts.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.Tts.Tests/Tizen.Tts.Tests.csproj
+++ b/tct-suite-vs/Tizen.Tts.Tests/Tizen.Tts.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.Tts.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Tts.Tests/tizen-manifest.xml
index f72dc4834..b6920767b 100755
--- a/tct-suite-vs/Tizen.Tts.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Tts.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Tts.Tests" version="1.0.0">
 	<profile name="common" />
-	<ui-application appid="Tizen.Tts.Tests"
-					exec="Tizen.Tts.Tests.dll"
-					type="dotnet"
-					multiple="false"
-					taskmanage="true"
-					launch_mode="single">
+	<service-application appid="Tizen.Tts.Tests" exec="Tizen.Tts.Tests.dll" type="dotnet">
 	<icon>Tizen.Tts.Tests.png</icon>
 	<label>Tizen.Tts.Tests</label>
-	</ui-application>
+	</service-application>
 	<privileges>
 	  <privilege>http://tizen.org/privilege/recorder</privilege>
           <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.Usb.Tests/Program.cs b/tct-suite-vs/Tizen.Usb.Tests/Program.cs
index 129489a65..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Usb.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Usb.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
 }
+
diff --git a/tct-suite-vs/Tizen.Usb.Tests/Tizen.Usb.Tests.csproj b/tct-suite-vs/Tizen.Usb.Tests/Tizen.Usb.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Usb.Tests/Tizen.Usb.Tests.csproj
+++ b/tct-suite-vs/Tizen.Usb.Tests/Tizen.Usb.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Usb.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Usb.Tests/tizen-manifest.xml
index 03e3680f7..863e52c87 100755
--- a/tct-suite-vs/Tizen.Usb.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Usb.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Usb.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.Usb.Tests"
-                    exec="Tizen.Usb.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.Usb.Tests" exec="Tizen.Usb.Tests.dll" type="dotnet">
     <icon>Tizen.Usb.Tests.png</icon>
     <label>Tizen.Usb.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
     </privileges>
diff --git a/tct-suite-vs/Tizen.VoiceControl.Tests/Program.cs b/tct-suite-vs/Tizen.VoiceControl.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.VoiceControl.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.VoiceControl.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.VoiceControl.Tests/Tizen.VoiceControl.Tests.csproj b/tct-suite-vs/Tizen.VoiceControl.Tests/Tizen.VoiceControl.Tests.csproj
index f837ac3bf..aecdf141b 100755
--- a/tct-suite-vs/Tizen.VoiceControl.Tests/Tizen.VoiceControl.Tests.csproj
+++ b/tct-suite-vs/Tizen.VoiceControl.Tests/Tizen.VoiceControl.Tests.csproj
@@ -32,9 +32,11 @@
     <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
+  <!-- Include Nuget Package for Tizen Project building -->
+
 </Project>
diff --git a/tct-suite-vs/Tizen.VoiceControl.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.VoiceControl.Tests/tizen-manifest.xml
index 6304543af..c3976e2dc 100755
--- a/tct-suite-vs/Tizen.VoiceControl.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.VoiceControl.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.VoiceControl.Tests" version="1.0.0">
 	<profile name="common" />
-	<ui-application appid="Tizen.VoiceControl.Tests"
-					exec="Tizen.VoiceControl.Tests.dll"
-					type="dotnet"
-					multiple="false"
-					taskmanage="true"
-					launch_mode="single">
+	<service-application appid="Tizen.VoiceControl.Tests" exec="Tizen.VoiceControl.Tests.dll" type="dotnet">
 	<icon>Tizen.VoiceControl.Tests.png</icon>
 	<label>Tizen.VoiceControl.Tests</label>
-	</ui-application>
+	</service-application>
 	<privileges>
 	   <privilege>http://tizen.org/privilege/recorder</privilege>
            <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
diff --git a/tct-suite-vs/Tizen.WiFi.Tests/Program.cs b/tct-suite-vs/Tizen.WiFi.Tests/Program.cs
index 129489a65..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.WiFi.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.WiFi.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
 }
+
diff --git a/tct-suite-vs/Tizen.WiFi.Tests/Tizen.WiFi.Tests.csproj b/tct-suite-vs/Tizen.WiFi.Tests/Tizen.WiFi.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.WiFi.Tests/Tizen.WiFi.Tests.csproj
+++ b/tct-suite-vs/Tizen.WiFi.Tests/Tizen.WiFi.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.WiFi.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.WiFi.Tests/tizen-manifest.xml
index c85b48cbb..8305360f4 100755
--- a/tct-suite-vs/Tizen.WiFi.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.WiFi.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.WiFi.Tests" version="1.0.0">
     <profile name="common" />
-    <ui-application appid="Tizen.WiFi.Tests"
-                    exec="Tizen.WiFi.Tests.dll"
-                    type="dotnet"
-                    multiple="false"
-                    taskmanage="true"
-                    launch_mode="single">
+    <service-application appid="Tizen.WiFi.Tests" exec="Tizen.WiFi.Tests.dll" type="dotnet">
     <icon>Tizen.WiFi.Tests.png</icon>
     <label>Tizen.WiFi.Tests</label>
-    </ui-application>
+    </service-application>
     <privileges>
 		<privilege>http://tizen.org/privilege/network.get</privilege>
 		<privilege>http://tizen.org/privilege/network.set</privilege>
diff --git a/tct-suite-vs/Tizen.Wifidirect.Tests/Program.cs b/tct-suite-vs/Tizen.Wifidirect.Tests/Program.cs
index 3df1d073a..dc2a22ecf 100755
--- a/tct-suite-vs/Tizen.Wifidirect.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.Wifidirect.Tests/Program.cs
@@ -1,52 +1,29 @@
-/*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
-
 using System;
 using NUnitLite.TUnit;
-using AutoTemplate;
+using Tizen.Applications;
 
-namespace XamarinForTizen.Tizen
+namespace TCT.Tizen
 {
 
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : ServiceApplication
     {
-        private static App _app;
         protected override void OnCreate()
         {
             base.OnCreate();
 
             Console.WriteLine("TCT : OnCreate()");
-            _app = new App();
-            LoadApplication(_app);
 
             TRunner t = new TRunner();
             t.LoadTestsuite();
             t.Execute();
         }
 
-        public static App getApp()
-        {
-            return _app;
-        }
         static void Main(string[] args)
         {
             Console.WriteLine("TCT : Main()");
             var app = new Program();
-            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/tct-suite-vs/Tizen.Wifidirect.Tests/Tizen.Wifidirect.Tests.csproj b/tct-suite-vs/Tizen.Wifidirect.Tests/Tizen.Wifidirect.Tests.csproj
index f837ac3bf..dfc06676c 100755
--- a/tct-suite-vs/Tizen.Wifidirect.Tests/Tizen.Wifidirect.Tests.csproj
+++ b/tct-suite-vs/Tizen.Wifidirect.Tests/Tizen.Wifidirect.Tests.csproj
@@ -34,7 +34,8 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <ProjectReference Include="..\Template\AutoTemplate\AutoTemplate.csproj" />
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj" />
+    <ProjectReference Include="..\nunitlite\nunitlite.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tct-suite-vs/Tizen.Wifidirect.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.Wifidirect.Tests/tizen-manifest.xml
index 03ae26b00..0d97743f3 100755
--- a/tct-suite-vs/Tizen.Wifidirect.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.Wifidirect.Tests/tizen-manifest.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="Tizen.Wifidirect.Tests" version="1.0.0">
   <profile name="common" />
-  <ui-application appid="Tizen.Wifidirect.Tests"
-                  exec="Tizen.Wifidirect.Tests.dll"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="true"
-                  launch_mode="single">
+  <service-application appid="Tizen.Wifidirect.Tests" exec="Tizen.Wifidirect.Tests.dll" type="dotnet">
     <icon>Tizen.Wifidirect.Tests.png</icon>
     <label>Tizen.Wifidirect.Tests</label>
-  </ui-application>
+  </service-application>
   <privileges>
     <privilege>http://tizen.org/privilege/wifidirect</privilege>
     <privilege>http://tizen.org/privilege/appmanager.launch</privilege>