diff --git a/src/BuildScripts/build.proj b/src/BuildScripts/build.proj
index 86739aaa..1fb02bd2 100644
--- a/src/BuildScripts/build.proj
+++ b/src/BuildScripts/build.proj
@@ -4,7 +4,7 @@
 
   <Import Project="common.props"/>
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
-  
+
 
   <Target Name="ci" DependsOnTargets="clean;nugetRestore;version;build;unittest;publish;archive"/>
 
@@ -12,12 +12,12 @@
   <Target Name="nugetRestore">
     <NuGetRestore Solution ="$(SolutionPath)" />
   </Target>
-  
+
   <!--Target to clean output folder if exists-->
   <Target Name="clean">
     <RemoveDir Directories="$(OutputPath)" Condition="Exists($(OutputPath))" />
   </Target>
-  
+
   <!--Target to create assembly version info-->
   <Target Name="version">
     <Time>
@@ -38,40 +38,42 @@
                   AssemblyVersion="$(Version)"
                   AssemblyFileVersion="$(FileVersion)"
                   AssemblyInformationalVersion="$(InformationalVersion)" />
-  
+
   </Target>
 
   <!--Target to build solution using the sln file-->
   <Target Name="build" DependsOnTargets="clean">
     <Message Text="Building $(SolutionFileName)"/>
-    
+
     <MSBuild Projects="$(SolutionFileName)" Properties="Configuration=$(BuildConfiguration);OutputPath=$(OutputPath)"/>
 
   </Target>
 
 
   <ItemGroup>
-    <UnitTestAssemblies Include="$(OutputPath)\.Tests.dll"/>
+    <UnitTestAssemblies Include="$(OutputPath)\*.Tests.dll"/>
   </ItemGroup>
-  
+
   <Target Name="unittest" Condition="'$(UnitTest)'" DependsOnTargets="build">
     <Message Text="Running Unit Tests..."/>
-    <NUnit Assemblies="@(UnitTestAssemblies)">
-      
-    </NUnit>
 
-   
+    <Exec Command="nunit-console @(UnitTestAssemblies->'%(FullPath)',' ') /nologo"/>
 
+
+
+
+
+    <Message Text="Unit Tests Done."/>
   </Target>
 
   <Target Name="publish" Condition="'$(Publish)'" DependsOnTargets="unittest">
     <Message Text="Publishing..."/>
-    
+
   </Target>
 
   <Target Name="archive" Condition="'$(Archive)'"  DependsOnTargets="publish">
     <Message Text="Archiving..."/>
-    
+
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/src/BuildScripts/common.props b/src/BuildScripts/common.props
index 07448925..d26f65cf 100644
--- a/src/BuildScripts/common.props
+++ b/src/BuildScripts/common.props
@@ -16,7 +16,7 @@
   <PropertyGroup>
 
     <Publish Condition="'$(Publish)' == ''" >true</Publish>
-    <Archive Condition="'$(Arquive)' == ''">true</Archive>
+    <Archive Condition="'$(Archive)' == ''">true</Archive>
     <UnitTest Condition="'$(UnitTest)' == ''">false</UnitTest>
 
   </PropertyGroup>