diff --git a/Autofac.Extras.FakeItEasy.sln b/Autofac.Extras.FakeItEasy.sln
index 1559193..68b839a 100644
--- a/Autofac.Extras.FakeItEasy.sln
+++ b/Autofac.Extras.FakeItEasy.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.FakeItEasy", "src\Autofac.Extras.FakeItEasy\Autofac.Extras.FakeItEasy.csproj", "{2BFDBAB2-E2DA-4588-AE2D-133896FF8861}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.Tests.FakeItEasy", "test\Autofac.Extras.Tests.FakeItEasy\Autofac.Extras.Tests.FakeItEasy.csproj", "{F8482A7A-CAA1-4D8B-BD67-1BB5FBD3A938}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.FakeItEasy.Test", "test\Autofac.Extras.FakeItEasy.Test\Autofac.Extras.FakeItEasy.Test.csproj", "{F8482A7A-CAA1-4D8B-BD67-1BB5FBD3A938}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Autofac.Extras.FakeItEasy/Autofac.Extras.FakeItEasy.csproj b/src/Autofac.Extras.FakeItEasy/Autofac.Extras.FakeItEasy.csproj
index de97623..8294bf4 100644
--- a/src/Autofac.Extras.FakeItEasy/Autofac.Extras.FakeItEasy.csproj
+++ b/src/Autofac.Extras.FakeItEasy/Autofac.Extras.FakeItEasy.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,10 +13,11 @@
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
     <TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">Client</TargetFrameworkProfile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,6 +30,7 @@
     <CodeAnalysisRuleSet>..\..\Full.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <DocumentationFile>bin\Debug\Autofac.Extras.FakeItEasy.xml</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,6 +42,7 @@
     <CodeAnalysisRuleSet>..\..\Full.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <DocumentationFile>bin\Release\Autofac.Extras.FakeItEasy.xml</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Autofac, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
diff --git a/src/Autofac.Extras.FakeItEasy/Properties/AssemblyInfo.cs b/src/Autofac.Extras.FakeItEasy/Properties/AssemblyInfo.cs
index f45cf8f..fc4dc8f 100644
--- a/src/Autofac.Extras.FakeItEasy/Properties/AssemblyInfo.cs
+++ b/src/Autofac.Extras.FakeItEasy/Properties/AssemblyInfo.cs
@@ -18,4 +18,4 @@
 [assembly: AssemblyInformationalVersion("0.0.0")]
 [assembly: AssemblyConfiguration("Release")]
 [assembly: AssemblyCopyright("Copyright © 2014 Autofac Contributors")]
-[assembly: AssemblyDescription("FakeItEasy auto mocking integration for Autofac IoC")]
\ No newline at end of file
+[assembly: AssemblyDescription("FakeItEasy auto mocking integration for Autofac IoC.")]
\ No newline at end of file
diff --git a/test/Autofac.Extras.Tests.FakeItEasy/AutoFakeFixture.cs b/test/Autofac.Extras.FakeItEasy.Test/AutoFakeFixture.cs
similarity index 83%
rename from test/Autofac.Extras.Tests.FakeItEasy/AutoFakeFixture.cs
rename to test/Autofac.Extras.FakeItEasy.Test/AutoFakeFixture.cs
index 3887250..8a62d16 100644
--- a/test/Autofac.Extras.Tests.FakeItEasy/AutoFakeFixture.cs
+++ b/test/Autofac.Extras.FakeItEasy.Test/AutoFakeFixture.cs
@@ -1,210 +1,210 @@
-using System;
-using System.Reflection.Emit;
-using Autofac.Extras.FakeItEasy;
-using FakeItEasy;
-using NUnit.Framework;
-
-namespace Autofac.Extras.Tests.FakeItEasy
-{
-    [TestFixture]
-    public sealed class AutoFakeFixture
-    {
-        [Test]
-        public void ByDefaultFakesAreNotStrict()
-        {
-            using (var fake = new AutoFake())
-            {
-                var foo = fake.Resolve<Foo>();
-                Assert.DoesNotThrow(() => foo.Go());
-            }
-        }
-
-        [Test]
-        public void CanResolveStrictFakes()
-        {
-            using (var fake = new AutoFake(strict: true))
-            {
-                var foo = fake.Resolve<Foo>();
-                Assert.Throws<ExpectationException>(() => foo.Go());
-            }
-        }
-
-        [Test]
-        public void ByDefaultFakesDoNotCallBaseMethods()
-        {
-            using (var fake = new AutoFake())
-            {
-                var bar = fake.Resolve<Bar>();
-                bar.Go();
-                Assert.False(bar.Gone);
-            }
-        }
-
-        [Test]
-        public void CanResolveFakesWhichCallsBaseMethods()
-        {
-            using (var fake = new AutoFake(callsBaseMethods: true))
-            {
-                var bar = fake.Resolve<Bar>();
-                bar.Go();
-                Assert.True(bar.Gone);
-            }
-        }
-
-        [Test]
-        public void ByDefaultFakesRespondToCalls()
-        {
-            using (var fake = new AutoFake())
-            {
-                var bar = fake.Resolve<IBar>();
-                var result = bar.Spawn();
-                Assert.NotNull(result);
-            }
-        }
-
-        [Test]
-        public void CanResolveFakesWhichDoNotRespondToCalls()
-        {
-            using (var fake = new AutoFake(callsDoNothing: true))
-            {
-                var bar = fake.Resolve<IBar>();
-                var result = bar.Spawn();
-                Assert.Null(result);
-            }
-        }
-
-        [Test]
-        public void CanResolveFakesWhichInvokeActionsWhenResolved()
-        {
-            object resolvedFake = null;
-            using (var fake = new AutoFake(configureFake: obj => resolvedFake = obj))
-            {
-                var bar = fake.Resolve<IBar>();
-                Assert.AreSame(bar, resolvedFake);
-            }
-        }
-
-        [Test]
-        public void ProvidesInstances()
-        {
-            using (var fake = new AutoFake())
-            {
-                var bar = A.Fake<IBar>();
-                fake.Provide(bar);
-
-                var foo = fake.Resolve<Foo>();
-                foo.Go();
-
-                A.CallTo(() => bar.Go()).MustHaveHappened();
-            }
-        }
-
-        [Test]
-        public void ProvidesImplementations()
-        {
-            using (var fake = new AutoFake())
-            {
-                var baz = fake.Provide<IBaz, Baz>();
-
-                Assert.IsNotNull(baz);
-                Assert.IsTrue(baz is Baz);
-            }
-        }
-
-        [Test]
-        public void ByDefaultAbstractTypesAreResolvedToTheSameSharedInstance()
-        {
-            using (var fake = new AutoFake())
-            {
-                var bar1 = fake.Resolve<IBar>();
-                var bar2 = fake.Resolve<IBar>();
-
-                Assert.AreSame(bar1, bar2);
-            }
-        }
-
-        [Test]
-        public void ByDefaultConcreteTypesAreResolvedToTheSameSharedInstance()
-        {
-            using (var fake = new AutoFake())
-            {
-                var baz1 = fake.Resolve<Baz>();
-                var baz2 = fake.Resolve<Baz>();
-
-                Assert.AreSame(baz1, baz2);
-            }
-        }
-
-        public interface IBar
-        {
-            bool Gone { get; }
-
-            void Go();
-
-            IBar Spawn();
-        }
-
-        public abstract class Bar : IBar
-        {
-            private bool _gone;
-
-            public bool Gone
-            {
-                get { return this._gone; }
-            }
-
-            public virtual void Go()
-            {
-                this._gone = true;
-            }
-
-            public IBar Spawn()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public interface IBaz
-        {
-            void Go();
-        }
-
-        public class Baz : IBaz
-        {
-            private bool _gone;
-
-            public bool Gone
-            {
-                get { return this._gone; }
-            }
-
-            public virtual void Go()
-            {
-                this._gone = true;
-            }
-        }
-
-        public class Foo
-        {
-            private readonly IBar _bar;
-            private readonly IBaz _baz;
-
-            public Foo(IBar bar, IBaz baz)
-            {
-                this._bar = bar;
-                this._baz = baz;
-            }
-
-            public virtual void Go()
-            {
-                this._bar.Go();
-                this._baz.Go();
-            }
-        }
-
-        [AttributeUsage(AttributeTargets.Class)]
-        public class ForTestAttribute : Attribute
-        {
-        }
-    }
-}
+using System;
+using FakeItEasy;
+using Xunit;
+
+namespace Autofac.Extras.FakeItEasy.Test
+{
+    public class AutoFakeFixture
+    {
+        public interface IBar
+        {
+            bool Gone { get; }
+
+            void Go();
+
+            IBar Spawn();
+        }
+
+        public interface IBaz
+        {
+            void Go();
+        }
+
+        [Fact]
+        public void ByDefaultAbstractTypesAreResolvedToTheSameSharedInstance()
+        {
+            using (var fake = new AutoFake())
+            {
+                var bar1 = fake.Resolve<IBar>();
+                var bar2 = fake.Resolve<IBar>();
+
+                Assert.Same(bar1, bar2);
+            }
+        }
+
+        [Fact]
+        public void ByDefaultConcreteTypesAreResolvedToTheSameSharedInstance()
+        {
+            using (var fake = new AutoFake())
+            {
+                var baz1 = fake.Resolve<Baz>();
+                var baz2 = fake.Resolve<Baz>();
+
+                Assert.Same(baz1, baz2);
+            }
+        }
+
+        [Fact]
+        public void ByDefaultFakesAreNotStrict()
+        {
+            using (var fake = new AutoFake())
+            {
+                var foo = fake.Resolve<Foo>();
+
+                // Should not throw.
+                foo.Go();
+            }
+        }
+
+        [Fact]
+        public void ByDefaultFakesDoNotCallBaseMethods()
+        {
+            using (var fake = new AutoFake())
+            {
+                var bar = fake.Resolve<Bar>();
+                bar.Go();
+                Assert.False(bar.Gone);
+            }
+        }
+
+        [Fact]
+        public void ByDefaultFakesRespondToCalls()
+        {
+            using (var fake = new AutoFake())
+            {
+                var bar = fake.Resolve<IBar>();
+                var result = bar.Spawn();
+                Assert.NotNull(result);
+            }
+        }
+
+        [Fact]
+        public void CanResolveFakesWhichCallsBaseMethods()
+        {
+            using (var fake = new AutoFake(callsBaseMethods: true))
+            {
+                var bar = fake.Resolve<Bar>();
+                bar.Go();
+                Assert.True(bar.Gone);
+            }
+        }
+
+        [Fact]
+        public void CanResolveFakesWhichDoNotRespondToCalls()
+        {
+            using (var fake = new AutoFake(callsDoNothing: true))
+            {
+                var bar = fake.Resolve<IBar>();
+                var result = bar.Spawn();
+                Assert.Null(result);
+            }
+        }
+
+        [Fact]
+        public void CanResolveFakesWhichInvokeActionsWhenResolved()
+        {
+            var resolvedFake = (object)null;
+            using (var fake = new AutoFake(configureFake: obj => resolvedFake = obj))
+            {
+                var bar = fake.Resolve<IBar>();
+                Assert.Same(bar, resolvedFake);
+            }
+        }
+
+        [Fact]
+        public void CanResolveStrictFakes()
+        {
+            using (var fake = new AutoFake(strict: true))
+            {
+                var foo = fake.Resolve<Foo>();
+                Assert.Throws<ExpectationException>(() => foo.Go());
+            }
+        }
+
+        [Fact]
+        public void ProvidesImplementations()
+        {
+            using (var fake = new AutoFake())
+            {
+                var baz = fake.Provide<IBaz, Baz>();
+
+                Assert.NotNull(baz);
+                Assert.True(baz is Baz);
+            }
+        }
+
+        [Fact]
+        public void ProvidesInstances()
+        {
+            using (var fake = new AutoFake())
+            {
+                var bar = A.Fake<IBar>();
+                fake.Provide(bar);
+
+                var foo = fake.Resolve<Foo>();
+                foo.Go();
+
+                A.CallTo(() => bar.Go()).MustHaveHappened();
+            }
+        }
+
+        public abstract class Bar : IBar
+        {
+            private bool _gone;
+
+            public bool Gone
+            {
+                get { return this._gone; }
+            }
+
+            public virtual void Go()
+            {
+                this._gone = true;
+            }
+
+            public IBar Spawn()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public class Baz : IBaz
+        {
+            private bool _gone;
+
+            public bool Gone
+            {
+                get { return this._gone; }
+            }
+
+            public virtual void Go()
+            {
+                this._gone = true;
+            }
+        }
+
+        public class Foo
+        {
+            private readonly IBar _bar;
+
+            private readonly IBaz _baz;
+
+            public Foo(IBar bar, IBaz baz)
+            {
+                this._bar = bar;
+                this._baz = baz;
+            }
+
+            public virtual void Go()
+            {
+                this._bar.Go();
+                this._baz.Go();
+            }
+        }
+
+        [AttributeUsage(AttributeTargets.Class)]
+        public class ForTestAttribute : Attribute
+        {
+        }
+    }
+}
diff --git a/test/Autofac.Extras.Tests.FakeItEasy/Autofac.Extras.Tests.FakeItEasy.csproj b/test/Autofac.Extras.FakeItEasy.Test/Autofac.Extras.FakeItEasy.Test.csproj
similarity index 65%
rename from test/Autofac.Extras.Tests.FakeItEasy/Autofac.Extras.Tests.FakeItEasy.csproj
rename to test/Autofac.Extras.FakeItEasy.Test/Autofac.Extras.FakeItEasy.Test.csproj
index deb4524..629b433 100644
--- a/test/Autofac.Extras.Tests.FakeItEasy/Autofac.Extras.Tests.FakeItEasy.csproj
+++ b/test/Autofac.Extras.FakeItEasy.Test/Autofac.Extras.FakeItEasy.Test.csproj
@@ -1,119 +1,144 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F8482A7A-CAA1-4D8B-BD67-1BB5FBD3A938}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Autofac.Extras.Tests.FakeItEasy</RootNamespace>
-    <AssemblyName>Autofac.Extras.Tests.FakeItEasy</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">Client</TargetFrameworkProfile>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0-rc1\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutoFakeFixture.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Autofac.Extras.FakeItEasy\Autofac.Extras.FakeItEasy.csproj">
-      <Project>{2bfdbab2-e2da-4588-ae2d-133896ff8861}</Project>
-      <Name>Autofac.Extras.FakeItEasy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?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.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F8482A7A-CAA1-4D8B-BD67-1BB5FBD3A938}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Autofac.Extras.FakeItEasy.Test</RootNamespace>
+    <AssemblyName>Autofac.Extras.FakeItEasy.Test</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">Client</TargetFrameworkProfile>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Autofac, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll</HintPath>
+    </Reference>
+    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AutoFakeFixture.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Autofac.Extras.FakeItEasy\Autofac.Extras.FakeItEasy.csproj">
+      <Project>{2bfdbab2-e2da-4588-ae2d-133896ff8861}</Project>
+      <Name>Autofac.Extras.FakeItEasy</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/test/Autofac.Extras.FakeItEasy.Test/Properties/AssemblyInfo.cs b/test/Autofac.Extras.FakeItEasy.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..ba2735b
--- /dev/null
+++ b/test/Autofac.Extras.FakeItEasy.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("Autofac.Extras.FakeItEasy.Test")]
diff --git a/test/Autofac.Extras.FakeItEasy.Test/packages.config b/test/Autofac.Extras.FakeItEasy.Test/packages.config
new file mode 100644
index 0000000..b0a24d9
--- /dev/null
+++ b/test/Autofac.Extras.FakeItEasy.Test/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Autofac" version="3.3.1" targetFramework="net40" />
+  <package id="FakeItEasy" version="2.0.0" targetFramework="net40" />
+  <package id="xunit" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.runner.console" version="2.1.0" targetFramework="net451" />
+  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/test/Autofac.Extras.Tests.FakeItEasy/Properties/AssemblyInfo.cs b/test/Autofac.Extras.Tests.FakeItEasy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3ae1fbb..0000000
--- a/test/Autofac.Extras.Tests.FakeItEasy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("Autofac.Extras.Tests.FakeItEasy")]
diff --git a/test/Autofac.Extras.Tests.FakeItEasy/packages.config b/test/Autofac.Extras.Tests.FakeItEasy/packages.config
deleted file mode 100644
index 9ca0d3f..0000000
--- a/test/Autofac.Extras.Tests.FakeItEasy/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Autofac" version="3.3.1" targetFramework="net40" />
-  <package id="FakeItEasy" version="2.0.0-rc1" targetFramework="net40" />
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
-</packages>
\ No newline at end of file