diff --git a/Orchard.proj b/Orchard.proj
index b97516326..4d9f17387 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -39,7 +39,7 @@
   <Target Name ="Build">
     <CallTarget Targets="Clean"/>
     <CallTarget Targets="Compile"/>
-    <!--<CallTarget Targets="Test"/>-->
+    <CallTarget Targets="Test"/>
     <CallTarget Targets="Package"/> 
   </Target>
 
@@ -133,7 +133,7 @@
   <Target Name ="Test">
     <!-- TeamCity support -->
     <ItemGroup>
-      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.5.2.*" />
+      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.0.*" />
     </ItemGroup>
     <Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(LibFolder)\nunit\addins" />
 
@@ -148,7 +148,7 @@
   <Target Name ="Spec" DependsOnTargets="Package-Stage">
     <!-- TeamCity support -->
     <ItemGroup>
-      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.5.2.*" />
+      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.0.*" />
     </ItemGroup>
     <Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(LibFolder)\nunit\addins" />
 
diff --git a/src/Orchard.Specs/Admin.feature.cs b/src/Orchard.Specs/Admin.feature.cs
index faec80ef9..575a27e06 100644
--- a/src/Orchard.Specs/Admin.feature.cs
+++ b/src/Orchard.Specs/Admin.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Blogs.feature.cs b/src/Orchard.Specs/Blogs.feature.cs
index ab2cf135a..009fde8a3 100644
--- a/src/Orchard.Specs/Blogs.feature.cs
+++ b/src/Orchard.Specs/Blogs.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Comments.feature.cs b/src/Orchard.Specs/Comments.feature.cs
index 44cae3971..3b19850b3 100644
--- a/src/Orchard.Specs/Comments.feature.cs
+++ b/src/Orchard.Specs/Comments.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/ContentRights.feature.cs b/src/Orchard.Specs/ContentRights.feature.cs
index b082dde56..67c224b80 100644
--- a/src/Orchard.Specs/ContentRights.feature.cs
+++ b/src/Orchard.Specs/ContentRights.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/ContentTypes.feature.cs b/src/Orchard.Specs/ContentTypes.feature.cs
index 501158c05..d419ee4b3 100644
--- a/src/Orchard.Specs/ContentTypes.feature.cs
+++ b/src/Orchard.Specs/ContentTypes.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Lists.feature.cs b/src/Orchard.Specs/Lists.feature.cs
index 0872314c2..5c898655d 100644
--- a/src/Orchard.Specs/Lists.feature.cs
+++ b/src/Orchard.Specs/Lists.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Media.feature.cs b/src/Orchard.Specs/Media.feature.cs
index 7db7eaa1c..f59753449 100644
--- a/src/Orchard.Specs/Media.feature.cs
+++ b/src/Orchard.Specs/Media.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Modules.feature.cs b/src/Orchard.Specs/Modules.feature.cs
index 58c9563f6..1385be22e 100644
--- a/src/Orchard.Specs/Modules.feature.cs
+++ b/src/Orchard.Specs/Modules.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/MultiTenancy.feature.cs b/src/Orchard.Specs/MultiTenancy.feature.cs
index 7802946f6..8f63d5640 100644
--- a/src/Orchard.Specs/MultiTenancy.feature.cs
+++ b/src/Orchard.Specs/MultiTenancy.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Pages.feature.cs b/src/Orchard.Specs/Pages.feature.cs
index 84b17502e..10d4ad6cc 100644
--- a/src/Orchard.Specs/Pages.feature.cs
+++ b/src/Orchard.Specs/Pages.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/PermissionModel.feature.cs b/src/Orchard.Specs/PermissionModel.feature.cs
index 2d75b4b9c..b50d90296 100644
--- a/src/Orchard.Specs/PermissionModel.feature.cs
+++ b/src/Orchard.Specs/PermissionModel.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Setup.feature.cs b/src/Orchard.Specs/Setup.feature.cs
index 1830bb894..820fdcdd4 100644
--- a/src/Orchard.Specs/Setup.feature.cs
+++ b/src/Orchard.Specs/Setup.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/SiteCompilation.feature.cs b/src/Orchard.Specs/SiteCompilation.feature.cs
index ec3cebbdd..4602dd17b 100644
--- a/src/Orchard.Specs/SiteCompilation.feature.cs
+++ b/src/Orchard.Specs/SiteCompilation.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Tags.feature.cs b/src/Orchard.Specs/Tags.feature.cs
index 3bc8bb15b..4c0eac67d 100644
--- a/src/Orchard.Specs/Tags.feature.cs
+++ b/src/Orchard.Specs/Tags.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Users.feature.cs b/src/Orchard.Specs/Users.feature.cs
index 28862bf39..c3db073bf 100644
--- a/src/Orchard.Specs/Users.feature.cs
+++ b/src/Orchard.Specs/Users.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/UsingSpecFlow.feature.cs b/src/Orchard.Specs/UsingSpecFlow.feature.cs
index e97d0a4bf..f9f09d6d0 100644
--- a/src/Orchard.Specs/UsingSpecFlow.feature.cs
+++ b/src/Orchard.Specs/UsingSpecFlow.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/WebHosting.feature.cs b/src/Orchard.Specs/WebHosting.feature.cs
index 28ac30ccc..7acb8f1d2 100644
--- a/src/Orchard.Specs/WebHosting.feature.cs
+++ b/src/Orchard.Specs/WebHosting.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
diff --git a/src/Orchard.Specs/Widgets.feature.cs b/src/Orchard.Specs/Widgets.feature.cs
index 74fae5f5e..f45891e85 100644
--- a/src/Orchard.Specs/Widgets.feature.cs
+++ b/src/Orchard.Specs/Widgets.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.17929
+//      Runtime Version:4.0.30319.18003
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.