diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 9083414..381a85b 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -34,18 +34,7 @@
 				<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
 					<Name>tc_project_app Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
-					<UnrestoredVarLinks ImportTime="2020-03-04T10:57:30">
-						<OwnerA Name="InputDst" Prefix="TIPC^tc_project_app^tc_project_app Instance" Type="1">
-							<OwnerB Name="TINC^NC-Task 1 SAF^Axes^tcUNIT_simulated_axis">
-								<Link VarA="GVL.axes[1].Axis.NcToPlc" TypeA="MC.NCTOPLC_AXIS_REF" InOutA="0" GuidA="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" VarB="Outputs^ToPlc" RestoreInfo="ANotFound"/>
-							</OwnerB>
-						</OwnerA>
-						<OwnerA Name="OutputSrc" Prefix="TIPC^tc_project_app^tc_project_app Instance" Type="2">
-							<OwnerB Name="TINC^NC-Task 1 SAF^Axes^tcUNIT_simulated_axis">
-								<Link VarA="GVL.axes[1].Axis.PlcToNc" TypeA="MC.PLCTONC_AXIS_REF" InOutA="1" GuidA="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" VarB="Inputs^FromPlc" RestoreInfo="ANotFound"/>
-							</OwnerB>
-						</OwnerA>
-					</UnrestoredVarLinks>
+
 					<TaskPouOids>
 						<TaskPouOid Prio="20" OTCID="#x08502041"/>
 					</TaskPouOids>
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 155cea6..dc80599 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -131,6 +131,13 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Test\standard_library_tests\tcUNIT_STD_LIB_RUN.TcPOU">
+    <Compile Include="Test\app_tests\tcUNIT_APP_RUN.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Test\common\FB_tcUNIT_common.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Test\common\tcUNIT_GVL.TcGVL">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Visualization Manager.TcVMO">
@@ -141,8 +148,6 @@
     <Folder Include="DUTs" />
     <Folder Include="GVLs" />
     <Folder Include="Test" />
-    <Folder Include="Test\app_tests" />
-    <Folder Include="Test\common" />
     <Folder Include="tc_mca_std_lib" />
     <Folder Include="tc_mca_std_lib\DUTs" />
     <Folder Include="tc_mca_std_lib\GVLs" />
@@ -154,6 +159,8 @@
     <Folder Include="tc_mca_std_lib\POUs\Motion\Homing" />
     <Folder Include="tc_mca_std_lib\POUs\VISUs" />
     <Folder Include="Test\standard_library_tests" />
+    <Folder Include="Test\app_tests" />
+    <Folder Include="Test\common" />
     <Folder Include="VISUs" />
     <Folder Include="POUs" />
   </ItemGroup>