diff --git a/SpecificationTestPatterns/InstancePerClassConvention.cs b/SpecificationTestPatterns/InstancePerClassConvention.cs
new file mode 100644
index 0000000..fb2dbbe
--- /dev/null
+++ b/SpecificationTestPatterns/InstancePerClassConvention.cs
@@ -0,0 +1,20 @@
+namespace SpecificationTestPatterns
+{
+    using System.Linq;
+    using Fixie;
+    using FluentAssertions;
+    using Xunit;
+
+    public class InstancePerClassConvention : Convention
+    {
+        public InstancePerClassConvention()
+        {
+            Classes.Where(t => t.Name.StartsWith("When_") && 
+                t.Methods().SelectMany(m => m.GetCustomAttributes(typeof(FactAttribute), false)).Any());
+
+            Methods.Where(method => method.IsPublic && (method.IsVoid() || method.IsAsync()));
+
+            ClassExecution.CreateInstancePerClass();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SpecificationTestPatterns/SpecificationTestPatterns.csproj b/SpecificationTestPatterns/SpecificationTestPatterns.csproj
index af7dbf9..aa3d5c1 100644
--- a/SpecificationTestPatterns/SpecificationTestPatterns.csproj
+++ b/SpecificationTestPatterns/SpecificationTestPatterns.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -13,7 +12,7 @@
     <AssemblyName>SpecificationTestPatterns</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>8a22513f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>7460a358</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,6 +32,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Fixie, Version=1.0.0.15, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Fixie.1.0.0.15\lib\net45\Fixie.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FluentAssertions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.3.3.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
@@ -60,10 +63,6 @@
       <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
       <Private>True</Private>
@@ -71,6 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Context.cs" />
+    <Compile Include="InstancePerClassConvention.cs" />
     <Compile Include="JTokenExtensions.cs" />
     <Compile Include="ParseResult.cs" />
     <Compile Include="Tests.cs" />
@@ -90,7 +90,6 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SpecificationTestPatterns/Tests.cs b/SpecificationTestPatterns/Tests.cs
index 256b0b1..b700c64 100644
--- a/SpecificationTestPatterns/Tests.cs
+++ b/SpecificationTestPatterns/Tests.cs
@@ -4,7 +4,7 @@
     using FluentAssertions;
     using Ploeh.AutoFixture;
     using Xunit;
-    using InvalidTextContext = When_I_initialize_People_with_text_that_includes_invalid_data.Context;
+    using Fixture = Ploeh.AutoFixture.Fixture;
 
     public class When_I_initialize_People_with_Persons
     {
@@ -23,7 +23,7 @@ public class When_I_initialize_People_with_text
 
         public When_I_initialize_People_with_text()
         {
-            // Note - this arrangement/act is executed for each assertion.
+            // Note - this arrangement/act is executed once only.
             people = new People { "{\"firstName\":\"John\", \"lastName\":\"Smith\"}" };
         }
 
@@ -40,24 +40,18 @@ public void It_should_contain_expected_person()
         }
     }
 
-    
-
-    public class When_I_initialize_People_with_text_that_includes_invalid_data : IClassFixture<InvalidTextContext>
+    public class When_I_initialize_People_with_text_that_includes_invalid_data
     {
-        public class Context : Context<People>
-        {
-            public Context()
-            {
-                // Note - this arrangement/act is executed once only.
-                SUT = new People { "{\"firstName\":\"John\", \"lastName\":\"Smith\"}", "{\"member\":\"John\", \"another_member\":\"Smith\"}" };
-            }
-        }
-
         private People people;
 
-        public When_I_initialize_People_with_text_that_includes_invalid_data(InvalidTextContext context)
+        public When_I_initialize_People_with_text_that_includes_invalid_data()
         {
-            people = context.SUT;
+            // Note - this arrangement/act is executed once only.
+            people = new People
+            {
+                "{\"firstName\":\"John\", \"lastName\":\"Smith\"}",
+                "{\"member\":\"John\", \"another_member\":\"Smith\"}"
+            };
         }
 
         [Fact]
diff --git a/SpecificationTestPatterns/packages.config b/SpecificationTestPatterns/packages.config
index 27895ca..d19da4e 100644
--- a/SpecificationTestPatterns/packages.config
+++ b/SpecificationTestPatterns/packages.config
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoFixture" version="3.30.3" targetFramework="net452" />
+  <package id="Fixie" version="1.0.0.15" targetFramework="net452" />
   <package id="FluentAssertions" version="3.3.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
-  <package id="xunit" version="2.0.0" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net452" />
   <package id="xunit.core" version="2.0.0" targetFramework="net452" />
   <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net452" />
 </packages>
\ No newline at end of file