Index: Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/Constants.cs
===================================================================
--- Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/Constants.cs	(revision 33)
+++ Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/Constants.cs	(working copy)
@@ -11,6 +11,7 @@
         public const string ClrNameStartString = "NSpecify.";
         public const string MethodStartString = "spec";
         public const string FunctionalityAttribute = "NSpecify.Framework.FunctionalityAttribute";
+        public const string ContextAttribute = "NSpecify.Framework.ContextAttribute";
         public const string SpecificationAttribute = "NSpecify.Framework.SpecificationAttribute";
         public const string NSpecifyUnitID = "NSpecify";
         public const string FalseString = "false";
@@ -19,9 +20,13 @@
         public const string Explicitly = "Explicitly";
         public const string AssemblyLocation = "AssemblyLocation";
         public const string DestroyResourcesAttribute = "NSpecify.Framework.DestroyResourcesAttribute";
+        public const string AfterEachAttribute = "NSpecify.Framework.AfterEachAttribute";
         public const string SetupResourcesAttribute = "NSpecify.Framework.SetupResourcesAttribute";
+        public const string BeforeEachAttribute = "NSpecify.Framework.BeforeEachAttribute";
         public const string CleanupFunctionalityAttribute = "NSpecify.Framework.CleanupFunctionalityAttribute";
+        public const string AfterAllAttribute = "NSpecify.Framework.AfterAllAttribute";
         public const string InitializeFunctionalityAttribute = "NSpecify.Framework.InitializeFunctionalityAttribute";
+        public const string BeforeAllAttribute = "NSpecify.Framework.BeforeAllAttribute";
         public const string ExpectedExceptionOfAttribute = "NSpecify.Framework.ExpectedExceptionOfAttribute";
         public const string IgnoreAttribute = "NSpecify.Framework.IgnoreAttribute";
         public const string ThreadPriority = "ThreadPriority";
Index: Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/JetBrains.ReSharper.PowerToys.NSpecify.csproj
===================================================================
--- Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/JetBrains.ReSharper.PowerToys.NSpecify.csproj	(revision 33)
+++ Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/JetBrains.ReSharper.PowerToys.NSpecify.csproj	(working copy)
@@ -1,14 +1,19 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{22A92257-7F43-4DD5-B6F2-C98C5F7EA2D9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>JetBrains.ReSharper.PowerToys.NSpecify</RootNamespace>
     <AssemblyName>JetBrains.ReSharper.PowerToys.NSpecify</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,55 +58,59 @@
   <ItemGroup>
     <Reference Include="DevExpress.Data.v7.1, Version=7.1.3.0, Culture=neutral, PublicKeyToken=79868b8147b5eae4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\DevExpress.Data.v7.1.dll</HintPath>
+      <HintPath>..\..\SharedLibs\DevExpress.Data.v7.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v7.1, Version=7.1.3.0, Culture=neutral, PublicKeyToken=79868b8147b5eae4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\DevExpress.XtraEditors.v7.1.dll</HintPath>
+      <HintPath>..\..\SharedLibs\DevExpress.XtraEditors.v7.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.XtraTreeList.v7.1, Version=7.1.3.0, Culture=neutral, PublicKeyToken=79868b8147b5eae4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\DevExpress.XtraTreeList.v7.1.dll</HintPath>
+      <HintPath>..\..\SharedLibs\DevExpress.XtraTreeList.v7.1.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Metadata, Version=3.1.580.4, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.Metadata.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.DocumentManager, Version=3.1.580.4, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.ReSharper.DocumentManager.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.DocumentManager.dll</HintPath>
     </Reference>
+    <Reference Include="JetBrains.ReSharper.DocumentModel, Version=3.0.541.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.DocumentModel.dll</HintPath>
+    </Reference>
     <Reference Include="JetBrains.ReSharper.ProjectModel, Version=3.0.541.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.ReSharper.ProjectModel.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.ProjectModel.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.Psi, Version=3.0.541.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.ReSharper.Psi.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.Psi.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.TaskRunnerFramework, Version=3.0.541.1, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.ReSharper.TaskRunnerFramework.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.TaskRunnerFramework.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.TreeModelBrowser, Version=3.0.541.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.ReSharper.TreeModelBrowser.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.TreeModelBrowser.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.UnitTestExplorer, Version=3.0.541.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.ReSharper.UnitTestExplorer.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.ReSharper.UnitTestExplorer.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Shell, Version=3.0.541.1, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.Shell.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.Shell.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.UI, Version=3.0.541.1, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.UI.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.UI.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Util, Version=3.0.541.1, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Program Files\JetBrains\ReSharper\v3.1\vs8.0\Bin\JetBrains.Util.dll</HintPath>
+      <HintPath>..\..\SharedLibs\JetBrains.Util.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -119,6 +128,12 @@
   <ItemGroup>
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\NSpecify.Framework\NSpecify.Framework.csproj">
+      <Project>{C76774A3-FE94-42A7-A413-DD802E47BDD6}</Project>
+      <Name>NSpecify.Framework</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\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.
Index: Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/NSpecifyUnitTaskRunner.cs
===================================================================
--- Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/NSpecifyUnitTaskRunner.cs	(revision 33)
+++ Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/NSpecifyUnitTaskRunner.cs	(working copy)
@@ -676,7 +676,7 @@
         /// </returns>
         private static bool IsInitializeFunctionality(MethodInfo info)
         {
-            return CheckSetUpTearDownSignature(info, Constants.InitializeFunctionalityAttribute);
+            return CheckSetUpTearDownSignature(info, Constants.InitializeFunctionalityAttribute) || CheckSetUpTearDownSignature(info, Constants.BeforeAllAttribute);
         }
 
         /// <summary>
@@ -688,7 +688,7 @@
         /// </returns>
         private static bool IsCleanupFunctionality(MethodInfo info)
         {
-            return CheckSetUpTearDownSignature(info, Constants.CleanupFunctionalityAttribute);
+            return CheckSetUpTearDownSignature(info, Constants.CleanupFunctionalityAttribute) || CheckSetUpTearDownSignature(info, Constants.AfterAllAttribute);
         }
 
         /// <summary>
@@ -755,7 +755,7 @@
         /// </returns>
         private static bool IsSetupResources(MethodInfo info)
         {
-            return CheckSetUpTearDownSignature(info, Constants.SetupResourcesAttribute);
+            return CheckSetUpTearDownSignature(info, Constants.SetupResourcesAttribute) || CheckSetUpTearDownSignature(info, Constants.BeforeEachAttribute);
         }
 
         /// <summary>
@@ -767,7 +767,7 @@
         /// </returns>
         private static bool IsDestroyResources(MethodInfo info)
         {
-            return CheckSetUpTearDownSignature(info, Constants.DestroyResourcesAttribute);
+            return CheckSetUpTearDownSignature(info, Constants.DestroyResourcesAttribute)||CheckSetUpTearDownSignature(info,Constants.AfterEachAttribute);
         }
 
         /// <summary>
Index: Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/NSpecifyUnitTestProvider.cs
===================================================================
--- Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/NSpecifyUnitTestProvider.cs	(revision 33)
+++ Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/NSpecifyUnitTestProvider.cs	(working copy)
@@ -28,8 +28,9 @@
 
         private static readonly CLRTypeName IgnoreAttribute = new CLRTypeName(Constants.IgnoreAttribute);
         private static readonly NSpecifyUnitTestPresenter ourPresenter = new NSpecifyUnitTestPresenter();
-        private static readonly CLRTypeName TestAttribute = new CLRTypeName(Constants.SpecificationAttribute);
-        private static readonly CLRTypeName TestFixtureAttribute = new CLRTypeName(Constants.FunctionalityAttribute);
+        private static readonly CLRTypeName SpecificationAttribute = new CLRTypeName(Constants.SpecificationAttribute);
+        private static readonly CLRTypeName FunctionalityAttribute = new CLRTypeName(Constants.FunctionalityAttribute);
+        private static readonly CLRTypeName ContextAttribute = new CLRTypeName(Constants.ContextAttribute);
 
         #endregion
 
@@ -370,7 +371,7 @@
         /// </returns>
         private static bool HasSpecificationFixtureAttribute(IMetadataTypeInfo typeInfo)
         {
-            if(typeInfo.HasCustomAttribute(TestFixtureAttribute.ClrName))
+            if(typeInfo.HasCustomAttribute(FunctionalityAttribute.ClrName)||typeInfo.HasCustomAttribute(ContextAttribute.ClrName))
             {
                 return true;
             }
@@ -409,7 +410,7 @@
                 return false;
             }
 
-            if(typeElement.HasAttributeInstance(TestFixtureAttribute, false))
+            if(typeElement.HasAttributeInstance(FunctionalityAttribute, false)||typeElement.HasAttributeInstance(ContextAttribute,false))
             {
                 return true;
             }
@@ -425,7 +426,7 @@
                         break;
                     }
                     visited.Add(clazz);
-                    if(clazz.HasAttributeInstance(TestFixtureAttribute, false))
+                    if(clazz.HasAttributeInstance(FunctionalityAttribute, false)||clazz.HasAttributeInstance(ContextAttribute,false))
                     {
                         return true;
                     }
@@ -472,7 +473,7 @@
                 return false;
             }
 
-            if(method.HasAttributeInstance(TestAttribute, false))
+            if(method.HasAttributeInstance(SpecificationAttribute, false))
             {
                 return true;
             }
@@ -518,7 +519,7 @@
                 return false;
             }
 
-            if(method.HasCustomAttribute(TestAttribute.ClrName))
+            if(method.HasCustomAttribute(SpecificationAttribute.ClrName))
             {
                 return true;
             }
Index: Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/Resources/NSpecify.Designer.cs
===================================================================
--- Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/Resources/NSpecify.Designer.cs	(revision 33)
+++ Addins/JetBrains.ReSharper.UnitTestSupport.NSpecify/Resources/NSpecify.Designer.cs	(working copy)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.832
+//     Runtime Version:2.0.50727.1433
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
Index: Addins/NSpecify.Core.Extensions/Constants.cs
===================================================================
--- Addins/NSpecify.Core.Extensions/Constants.cs	(revision 33)
+++ Addins/NSpecify.Core.Extensions/Constants.cs	(working copy)
@@ -5,8 +5,18 @@
     /// </summary>
     public class Constants
     {
-        public const string FunctionalityAttribute = "NSpecify.Framework.FunctionalityAttribute";
-        public const string SpecificationAttribute = "NSpecify.Framework.SpecificationAttribute";
+        public static readonly string FunctionalityAttribute = "NSpecify.Framework.FunctionalityAttribute";
+        public static readonly string ContextAttribute = "NSpecify.Framework.ContextAttribute";
+        public static readonly string InitializeFunctionalityAttribute = "NSpecify.Framework.InitializeFunctionalityAttribute";
+        public static readonly string BeforeAllAttribute = "NSpecify.Framework.BeforeAllAttribute";
+        public static readonly string CleanupFunctionalityAttribute = "NSpecify.Framework.CleanupFunctionalityAttribute";
+        public static readonly string AfterAllAttribute = "NSpecify.Framework.AfterAllAttribute";
+        public static readonly string SpecificationAttribute = "NSpecify.Framework.SpecificationAttribute";
+        public static readonly string SetupResourcesAttribute = "NSpecify.Framework.SetupResourcesAttribute";
+        public static readonly string BeforeEachAttribute = "NSpecify.Framework.BeforeEachAttribute";
+        public static readonly string DestroyResourcesAttribute = "NSpecify.Framework.DestroyResourcesAttribute";
+        public static readonly string AfterEachAttribute = "NSpecify.Framework.AfterEachAttribute";
+
         public const string SuiteBuilders = "SuiteBuilders";
     }
 }
\ No newline at end of file
Index: Addins/NSpecify.Core.Extensions/NSpecify.Core.Extensions.csproj
===================================================================
--- Addins/NSpecify.Core.Extensions/NSpecify.Core.Extensions.csproj	(revision 33)
+++ Addins/NSpecify.Core.Extensions/NSpecify.Core.Extensions.csproj	(working copy)
@@ -1,14 +1,34 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B48FD7D6-C3A0-4070-BD82-E8C91B4868DF}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NUnit.Core.Extensions</RootNamespace>
     <AssemblyName>NSpecify.Core.Extensions</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </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>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,8 +49,18 @@
     <DocumentationFile>bin\Release\NSpecify.Core.Extensions.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.core, Version=2.4.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
-    <Reference Include="nunit.core.interfaces, Version=2.4.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="nunit.core, Version=2.4.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\SharedLibs\nunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.core.interfaces, Version=2.4.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\SharedLibs\nunit.core.interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\SharedLibs\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -56,6 +86,23 @@
   <ItemGroup>
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\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.
Index: Addins/NSpecify.Core.Extensions/NSpecifySuiteExtension.cs
===================================================================
--- Addins/NSpecify.Core.Extensions/NSpecifySuiteExtension.cs	(revision 33)
+++ Addins/NSpecify.Core.Extensions/NSpecifySuiteExtension.cs	(working copy)
@@ -22,20 +22,33 @@
             // Create the fixture object. We could wait to do this when
             // it is needed, but we do it here for simplicity.
             Fixture = Reflect.Construct(fixtureType);
-
+            fixtureSetUp = Reflect.GetMethodWithAttribute(fixtureType, Constants.InitializeFunctionalityAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true) ?? Reflect.GetMethodWithAttribute(fixtureType, Constants.BeforeAllAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true);
+            fixtureTearDown = Reflect.GetMethodWithAttribute(fixtureType, Constants.CleanupFunctionalityAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true) ?? Reflect.GetMethodWithAttribute(fixtureType, Constants.AfterAllAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true);
             // Locate our test methods and add them to the suite using
             // the Add method of TestSuite. Note that we don't do a simple
             // Tests.Add, because that wouldn't set the parent of the tests.
-            foreach(MethodInfo method in fixtureType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
+            foreach (MethodInfo method in fixtureType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
             {
                 Attribute spec = Reflect.GetAttribute(method, Constants.SpecificationAttribute, true);
-                if(spec != null)
+                if (spec != null)
                 {
-                    Add(new NUnitTestMethod(method));
+                    Add(new NSpecifyTestMethod(method));
                 }
             }
         }
 
         #endregion
     }
+
+    internal class NSpecifyTestMethod : NUnitTestMethod
+    {
+        public NSpecifyTestMethod(MethodInfo method)
+            : base(method)
+        {
+            setUpMethod = Reflect.GetMethodWithAttribute(FixtureType, Constants.SetupResourcesAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true) ?? Reflect.GetMethodWithAttribute(FixtureType, Constants.BeforeEachAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true);
+            tearDownMethod = Reflect.GetMethodWithAttribute(FixtureType, Constants.DestroyResourcesAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true) ?? Reflect.GetMethodWithAttribute(FixtureType, Constants.AfterEachAttribute, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly, true);
+        }
+    }
+
+
 }
\ No newline at end of file
Index: Addins/NSpecify.Core.Extensions/NSpecifySuiteExtensionBuilder.cs
===================================================================
--- Addins/NSpecify.Core.Extensions/NSpecifySuiteExtensionBuilder.cs	(revision 33)
+++ Addins/NSpecify.Core.Extensions/NSpecifySuiteExtensionBuilder.cs	(working copy)
@@ -1,5 +1,5 @@
 using System;
-
+using System.Diagnostics;
 using NUnit.Core.Extensibility;
 using NUnit.Core.Extensions;
 
@@ -19,6 +19,7 @@
 
         public Test BuildFrom(Type type)
         {
+            
             if(CanBuildFrom(type))
             {
                 return new NSpecifySuiteExtension(type);
@@ -32,7 +33,7 @@
         // implemented using reflection on the type.
         public bool CanBuildFrom(Type type)
         {
-            return Reflect.HasAttribute(type, Constants.FunctionalityAttribute, false);
+            return Reflect.HasAttribute(type, Constants.FunctionalityAttribute, false) || Reflect.HasAttribute(type, Constants.ContextAttribute, false);
         }
 
         #endregion

Property changes on: NSpecify.Framework
___________________________________________________________________
Name: svn:ignore
   - *

   + *
[Bb]in
obj
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto


Index: NSpecify.Framework/FunctionalityAttribute.cs
===================================================================
--- NSpecify.Framework/FunctionalityAttribute.cs	(revision 33)
+++ NSpecify.Framework/FunctionalityAttribute.cs	(working copy)
@@ -6,7 +6,7 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-    public sealed class FunctionalityAttribute : Attribute
+    public class FunctionalityAttribute : Attribute
     {
         #region Fields
 
@@ -24,7 +24,15 @@
         {
             this.description = description;
         }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FunctionalityAttribute"/> class.
+        /// </summary>
+        public FunctionalityAttribute()
+        {
+            description = string.Empty;
+        }
 
+
         #endregion
 
         #region Instance Properties
@@ -41,4 +49,9 @@
 
         #endregion
     }
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public sealed class ContextAttribute:FunctionalityAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/SetupResourcesAttribute.cs
===================================================================
--- NSpecify.Framework/SetupResourcesAttribute.cs	(revision 33)
+++ NSpecify.Framework/SetupResourcesAttribute.cs	(working copy)
@@ -3,7 +3,12 @@
     using System;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class SetupResourcesAttribute : Attribute
+    public class SetupResourcesAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class BeforeEachAttribute : SetupResourcesAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/CleanupFunctionalityAttribute.cs
===================================================================
--- NSpecify.Framework/CleanupFunctionalityAttribute.cs	(revision 33)
+++ NSpecify.Framework/CleanupFunctionalityAttribute.cs	(working copy)
@@ -6,7 +6,12 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class CleanupFunctionalityAttribute : Attribute
+    public class CleanupFunctionalityAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class AfterAllAttribute : CleanupFunctionalityAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/InitializeFunctionalityAttribute.cs
===================================================================
--- NSpecify.Framework/InitializeFunctionalityAttribute.cs	(revision 33)
+++ NSpecify.Framework/InitializeFunctionalityAttribute.cs	(working copy)
@@ -6,7 +6,12 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class InitializeFunctionalityAttribute : Attribute
+    public class InitializeFunctionalityAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class BeforeAllAttribute:InitializeFunctionalityAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/Specify.cs
===================================================================
--- NSpecify.Framework/Specify.cs	(revision 33)
+++ NSpecify.Framework/Specify.cs	(working copy)
@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
 namespace NSpecify.Framework
 {
     using System.Collections;
@@ -60,6 +64,10 @@
         {
             return new CollectionBehaviourBuilder(collection);
         }
+        public static ICollectionType That<T>(ICollection<T> collection)
+        {
+            return new CollectionBehaviourBuilder((ICollection)collection);
+        }
 
         public static IStringType That(string value)
         {
@@ -75,6 +83,10 @@
         {
             return new FileBehaviourBuilder(stream);
         }
+        public static IMethodType That(Action method)
+        {
+            return new MethodBehaviourBuilder(method);
+        }
 
         public static void ToFail()
         {
Index: NSpecify.Framework/SpecificationAttribute.cs
===================================================================
--- NSpecify.Framework/SpecificationAttribute.cs	(revision 33)
+++ NSpecify.Framework/SpecificationAttribute.cs	(working copy)
@@ -1,3 +1,5 @@
+using System.Text.RegularExpressions;
+
 namespace NSpecify.Framework
 {
     using System;
@@ -6,6 +8,7 @@
     /// The specification attribute
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    
     public class SpecificationAttribute : Attribute
     {
         #region Fields
@@ -24,7 +27,14 @@
         {
             this.description = description;
         }
-
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SpecificationAttribute"/> class.
+        /// creates a description based on the method name
+        /// </summary>
+        public SpecificationAttribute()
+        {
+            description = string.Empty;
+        }
         #endregion
 
         #region Instance Properties
Index: NSpecify.Framework/NSpecify.Framework.csproj
===================================================================
--- NSpecify.Framework/NSpecify.Framework.csproj	(revision 33)
+++ NSpecify.Framework/NSpecify.Framework.csproj	(working copy)
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C76774A3-FE94-42A7-A413-DD802E47BDD6}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -17,6 +17,12 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,10 +44,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Builder\MethodBehaviourBuilder.cs" />
     <Compile Include="GroupAttribute.cs" />
     <Compile Include="Exceptions\SpecificationFailedException.cs" />
     <Compile Include="Exceptions\SpecificationIgnoreException.cs" />
@@ -58,6 +68,7 @@
     <Compile Include="SetupResourcesAttribute.cs" />
     <Compile Include="Builder\FileBehaviourBuilder.cs" />
     <Compile Include="Syntax\IBooleanVerification.cs" />
+    <Compile Include="Syntax\ICollectionItemDirection.cs" />
     <Compile Include="Syntax\ICollectionVerification.cs" />
     <Compile Include="Syntax\IFileDirection.cs" />
     <Compile Include="Syntax\IFileNegative.cs" />
@@ -69,6 +80,8 @@
     <Compile Include="Syntax\IItemExpect.cs" />
     <Compile Include="Syntax\IItemNegative.cs" />
     <Compile Include="Syntax\ICollectionItems.cs" />
+    <Compile Include="Syntax\IMethodBehaviour.cs" />
+    <Compile Include="Syntax\IMethodType.cs" />
     <Compile Include="Syntax\IObjectVerification.cs" />
     <Compile Include="Syntax\IStringCaseIgnoring.cs" />
     <Compile Include="Syntax\IStringNegative.cs" />
Index: NSpecify.Framework/DestroyResourcesAttribute.cs
===================================================================
--- NSpecify.Framework/DestroyResourcesAttribute.cs	(revision 33)
+++ NSpecify.Framework/DestroyResourcesAttribute.cs	(working copy)
@@ -6,7 +6,12 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class DestroyResourcesAttribute : Attribute
+    public class DestroyResourcesAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class AfterEachAttribute : Attribute
+    {
+        
+    }
 }
\ No newline at end of file

Property changes on: NSpecify.Framework.Specification
___________________________________________________________________
Name: svn:ignore
   - bin
*

   + bin
*
[Bb]in
obj
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto


Index: NSpecify.Framework.Specification/NSpecify.Framework.Specification.csproj
===================================================================
--- NSpecify.Framework.Specification/NSpecify.Framework.Specification.csproj	(revision 33)
+++ NSpecify.Framework.Specification/NSpecify.Framework.Specification.csproj	(working copy)
@@ -1,14 +1,20 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C72D7CBE-74AD-44AB-BADF-3B85F8A2BA1F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NSpecify.Framework.Specification</RootNamespace>
     <AssemblyName>NSpecify.Framework.Specification</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,10 +43,14 @@
       <HintPath>..\SharedLibs\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="ExceptionBehaviourSyntax.cs" />
     <Compile Include="GreaterThanSyntax.cs" />
     <Compile Include="CollectionSyntax.cs" />
     <Compile Include="SpecificationExample.cs" />
Index: NSpecify.Framework.Specification/SpecificationExample.cs
===================================================================
--- NSpecify.Framework.Specification/SpecificationExample.cs	(revision 33)
+++ NSpecify.Framework.Specification/SpecificationExample.cs	(working copy)
@@ -57,7 +57,45 @@
 		{
 		}
 	}
+    [Context]
+    public class SaveCustomerFunctionalityWithAlternativeSyntax
+    {
+        private Customer customer = null;
 
+        [BeforeAll]
+        public void FunctionalitySetup()
+        {
+        }
+
+        [BeforeEach]
+        public void SpecificationSetup()
+        {
+            customer = new Customer(123);
+        }
+
+        [Specification("The customer id's should be equal")]
+        public void LoadCustomer()
+        {
+            Specify.That(customer.Id).Must.Equal(123, "The customer id's aren't equal");
+        }
+
+        [Specification("The customer id's should be equal")]
+        public void LoadCustomerFailed()
+        {
+            Specify.That(customer.Id).Must.Not.Equal(125, "The customer id's aren't equal");
+        }
+
+        [AfterEach]
+        public void SpecificationCleanup()
+        {
+            customer = null;
+        }
+
+        [AfterAll]
+        public void FunctionalityCleanup()
+        {
+        }
+    }
 	internal class Customer
 	{
 		private readonly int id;
Index: NSpecify.Framework.Specification/CollectionSyntax.cs
===================================================================
--- NSpecify.Framework.Specification/CollectionSyntax.cs	(revision 33)
+++ NSpecify.Framework.Specification/CollectionSyntax.cs	(working copy)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using NSpecify.Framework.Exceptions;
 using NUnit.Framework;
@@ -7,13 +8,584 @@
 namespace NSpecify.Framework.Specification
 {
     [TestFixture]
+    public class GenericCollectionSyntax
+    {
+        public void CollectionSyntaxSpecification()
+        {
+            object actual = new object();
+            ICollection<string> collection = new List<string>();
+            Type type = typeof (string);
+
+            Specify.That(collection).Items.Must.Be.InstanceOf(type);
+            Specify.That(collection).Items.Must.Not.Be.InstanceOf(type);
+
+            Specify.That(collection).Items.Must.Be.Unique();
+            Specify.That(collection).Items.Must.Not.Be.Unique();
+
+            Specify.That(collection).Items.Must.Be.Null();
+            Specify.That(collection).Items.Must.Not.Be.Null();
+
+            Specify.That(collection).Must.Contain(actual);
+            Specify.That(collection).Must.Equal(collection);
+            Specify.That(collection).Must.Be.EquivalentTo(collection);
+            Specify.That(collection).Must.Be.SubsetOf(collection);
+
+            Specify.That(collection).Must.Not.Equal(collection);
+            Specify.That(collection).Must.Not.Contain(actual);
+            Specify.That(collection).Must.Not.Be.EquivalentTo(collection);
+            Specify.That(collection).Must.Not.Be.SubsetOf(collection);
+        }
+
+        private const string typeErrorMsg =
+            "\r\n\tAll objects are not of actual type.\r\n\tset1.Count: 3\r\n\tactual: String";
+
+        private const string notnullErrorMsg = "\r\n\tAt least one object is null.\r\n\tset1.Count: 3";
+        private const string uniqueErrorMsg = "\r\n\tAt least one object is not unique within set1.\r\n\tset1.Count: 3";
+        private const string equalErrorMsg = "\r\n\tset1 and set2 are not equal at index 3";
+        private const string equalCountErrorMsg = "\r\n\tset1 and set2 do not have equal Count properties.";
+        private const string equivalentOneErrorMsg = "\r\n\tAn item from set1 was not found in set2.";
+        private const string equivalentTwoErrorMsg = "\r\n\tAn item from set2 was not found in set1.";
+
+        [Test]
+        public void AreEqual()
+        {
+            IList<string> set1 = new List<string>();
+            IList<string> set2 = new List<string>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("z");
+
+            Specify.That(set2).Must.Equal(set1);
+            Specify.That(set2).Must.Equal(set1, new TestComparer());
+            Specify.That(set2).Must.Equal(set1, "test");
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test");
+            Specify.That(set2).Must.Equal(set1, "test {0}", "1");
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test,
+         ExpectedException(typeof (SpecificationFailedException),
+             "The Elements at index don't match test 1")]
+        public void AreEqualFail()
+        {
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("a");
+
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The number of elements in the collections differ. test 1")]
+        public void AreEqualFailCount()
+        {
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("z");
+            set2.Add("a");
+            
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The Elements at index don't match test 1")]
+        public void AreEqualFailObject()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(a);
+
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test]
+        public void AreNotEqual()
+        {
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("x");
+
+            Specify.That(set2).Must.Not.Equal(set1);
+            Specify.That(set2).Must.Not.Equal(set1, new TestComparer());
+            Specify.That(set2).Must.Not.Equal(set1, "test");
+            Specify.That(set2).Must.Not.Equal(set1, new TestComparer(), "test");
+            Specify.That(set2).Must.Not.Equal(set1, "test {0}", "1");
+            Specify.That(set2).Must.Not.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test]
+        public void Contains()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<DataSet> al = new List<DataSet>();
+            al.Add(x);
+            al.Add(y);
+            al.Add(z);
+
+            Specify.That(al).Must.Contain(x);
+            Specify.That(al).Must.Contain(x, "test");
+            Specify.That(al).Must.Contain(x, "test {0}", "1");
+        }
+
+        [Test]
+        public void DoesNotContain()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(y);
+            al.Add(z);
+
+            Specify.That(al).Must.Not.Contain(a);
+            Specify.That(al).Must.Not.Contain(a, "test");
+            Specify.That(al).Must.Not.Contain(a, "test {0}", "1");
+        }
+
+        [Test]
+        public void Equivalent()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            set2.Add(z);
+            set2.Add(y);
+            set2.Add(x);
+
+            Specify.That(set2).Must.Be.EquivalentTo(set1);
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test");
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The expected collection contains 1 occurrence(s) of <System.Data.DataSet>. The actual collection contains 2 occurrence(s). test 1"
+             )]
+        public void EquivalentFailOne()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(x);
+
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The expected collection contains 2 occurrence(s) of <System.Data.DataSet>. The actual collection contains 1 occurrence(s). test 1"
+             )]
+        public void EquivalentFailTwo()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(x);
+
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(z);
+
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test]
+        public void IsNotSubsetOf()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            IList<object> set2 = new List<object>();
+            set1.Add(y);
+            set1.Add(z);
+            set2.Add(a);
+
+            Specify.That(set2).Must.Not.Be.SubsetOf(set1);
+            Specify.That(set2).Must.Not.Be.SubsetOf(set1, "test");
+            Specify.That(set2).Must.Not.Be.SubsetOf(set1, "test {0}", "1");
+        }
+
+        [Test]
+        public void IsSubsetOf()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            IList<object> set2 = new List<object>();
+            set2.Add(y);
+            set2.Add(z);
+
+            Specify.That(set1).Must.Be.SubsetOf(set2);
+            Specify.That(set1).Must.Be.SubsetOf(set2, "test");
+            Specify.That(set1).Must.Be.SubsetOf(set2, "test {0}", "1");
+        }
+
+        [Test]
+        public void ItemsNotNull()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null();
+            Specify.That(al).Items.Must.Not.Be.Null("test");
+            Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
+
+            al = new List<object>();
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+
+            Specify.That(al).Items.Must.Not.Be.Null();
+            Specify.That(al).Items.Must.Not.Be.Null("test");
+            Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
+        }
+
+        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        public void ItemsNotNullFail()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add(null);
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null();
+        }
+
+        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        public void ItemsNotNullFailMsg()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add(null);
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null("test");
+        }
+
+        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        public void ItemsNotNullFailMsgParam()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add(null);
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
+        }
+
+        [Test]
+        public void ItemsOfType()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+
+            al = new List<object>();
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test {0}", "1");
+        }
+
+        [Test]
+        [NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+            "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest"
+            )]
+        public void ItemsOfTypeFailMsg()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add(new object());
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest 1"
+             )]
+        public void ItemsOfTypeFailMsgParam()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add(new object());
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Object"
+             )]
+        public void ItemsOfTypeFailNoMsg()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add(new object());
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
+        }
+
+        [Test]
+        public void NotEquivalent()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(x);
+
+            Specify.That(set2).Must.Not.Be.EquivalentTo(set1);
+            Specify.That(set2).Must.Not.Be.EquivalentTo(set1, "test");
+            Specify.That(set2).Must.Not.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test]
+        public void Unique()
+        {
+            IList<object> al = new List<object>();
+            al.Add(new object());
+            al.Add(new object());
+            al.Add(new object());
+
+            Specify.That(al).Items.Must.Be.Unique();
+            Specify.That(al).Items.Must.Be.Unique("test");
+            Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
+
+            al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Be.Unique();
+            Specify.That(al).Items.Must.Be.Unique("test");
+            Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Duplicate item found:<System.Object>.")]
+        public void UniqueFail()
+        {
+            object x = new object();
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(new object());
+            al.Add(x);
+
+            Specify.That(al).Items.Must.Be.Unique();
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Duplicate item found:<System.Object>.test")]
+        public void UniqueFailMsg()
+        {
+            object x = new object();
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(new object());
+            al.Add(x);
+
+            Specify.That(al).Items.Must.Be.Unique("test");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Duplicate item found:<System.Object>.test 1")]
+        public void UniqueFailMsgParam()
+        {
+            object x = new object();
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(new object());
+            al.Add(x);
+
+            Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
+        }
+        [Test]
+        public void ContainsWithProperty()
+        {
+            string testPropertyValue = "This is the correct value";
+            IList<TestObject> list = new List<TestObject>();
+            TestObject obj1 = new TestObject();
+            TestObject obj2 = new TestObject();
+            TestObject obj3 = new TestObject();
+            
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain(typeof(TestObject)).WithProperty("TestProperty").EqualTo(testPropertyValue);
+        }
+        [Test]
+        public void ContainsInterfaceWithProperty()
+        {
+            string testPropertyValue = "This is the correct value";
+            IList<ITestObject> list = new List<ITestObject>();
+            ITestObject obj1 = new TestObject();
+            ITestObject obj2 = new TestObject();
+            ITestObject obj3 = new TestObject();
+
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain(typeof(ITestObject)).WithProperty("TestProperty").EqualTo(testPropertyValue);
+        }
+        [Test]
+        public void ContainsInterfaceWithIntProperty()
+        {
+            string testPropertyValue = "This is the correct value";
+            int testInt = 1023239;
+            IList<ITestObject> list = new List<ITestObject>();
+            ITestObject obj1 = new TestObject();
+            TestObject obj2 = new TestObject();
+            TestObject obj3 = new TestObject();
+
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            obj3.TestIntProperty = testInt;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain(typeof(ITestObject)).WithProperty("TestIntProperty").EqualTo(testInt);
+        }
+        [Test]
+        public void ContainsInterfaceUsingDelegate()
+        {
+            string testPropertyValue = "This is the correct value";
+            int testInt = 1023239;
+            IList<ITestObject> list = new List<ITestObject>();
+            ITestObject obj1 = new TestObject();
+            TestObject obj2 = new TestObject();
+            TestObject obj3 = new TestObject();
+
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            obj3.TestIntProperty = testInt;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain((ITestObject testObject) => {
+                return testObject.TestProperty == testPropertyValue; });
+        }
+        public interface ITestObject
+        {
+            string TestProperty{ get; set;}
+            int TestIntProperty{ get;}
+        }
+        public class TestObject:ITestObject
+        {
+            public string TestProperty{get;set;}
+            public int TestIntProperty { get; set; }
+        }
+
+    }
+    [TestFixture]
     public class CollectionSyntax
     {
         public void CollectionSyntaxSpecification()
         {
             object actual = new object();
             ICollection collection = new ArrayList();
-            Type type = typeof (string);
+            Type type = typeof(string);
 
             Specify.That(collection).Items.Must.Be.InstanceOf(type);
             Specify.That(collection).Items.Must.Not.Be.InstanceOf(type);
@@ -66,7 +638,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The Elements at index don't match test 1")]
         public void AreEqualFail()
         {
@@ -83,7 +655,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The number of elements in the collections differ. test 1")]
         public void AreEqualFailCount()
         {
@@ -101,7 +673,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The Elements at index don't match test 1")]
         public void AreEqualFailObject()
         {
@@ -202,7 +774,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The expected collection contains 1 occurrence(s) of <System.Data.DataSet>. The actual collection contains 2 occurrence(s). test 1"
              )]
         public void EquivalentFailOne()
@@ -226,7 +798,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The expected collection contains 2 occurrence(s) of <System.Data.DataSet>. The actual collection contains 1 occurrence(s). test 1"
              )]
         public void EquivalentFailTwo()
@@ -316,7 +888,7 @@
             Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
         }
 
-        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        [Test, NUnit.Framework.ExpectedException(typeof(SpecificationFailedException), "At least one item is null.")]
         public void ItemsNotNullFail()
         {
             ArrayList al = new ArrayList();
@@ -327,7 +899,7 @@
             Specify.That(al).Items.Must.Not.Be.Null();
         }
 
-        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        [Test, NUnit.Framework.ExpectedException(typeof(SpecificationFailedException), "At least one item is null.")]
         public void ItemsNotNullFailMsg()
         {
             ArrayList al = new ArrayList();
@@ -338,7 +910,7 @@
             Specify.That(al).Items.Must.Not.Be.Null("test");
         }
 
-        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        [Test, NUnit.Framework.ExpectedException(typeof(SpecificationFailedException), "At least one item is null.")]
         public void ItemsNotNullFailMsgParam()
         {
             ArrayList al = new ArrayList();
@@ -357,22 +929,22 @@
             al.Add("y");
             al.Add("z");
 
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test {0}", "1");
 
             al = new ArrayList();
             al.Add(new DataSet());
             al.Add(new DataSet());
             al.Add(new DataSet());
 
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet));
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test");
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test {0}", "1");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(DataSet));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(DataSet), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(DataSet), "test {0}", "1");
         }
 
         [Test]
-        [NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+        [NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
             "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest"
             )]
         public void ItemsOfTypeFailMsg()
@@ -381,11 +953,11 @@
             al.Add("x");
             al.Add("y");
             al.Add(new object());
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test");
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest 1"
              )]
         public void ItemsOfTypeFailMsgParam()
@@ -394,11 +966,11 @@
             al.Add("x");
             al.Add("y");
             al.Add(new object());
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test {0}", "1");
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Object"
              )]
         public void ItemsOfTypeFailNoMsg()
@@ -407,7 +979,7 @@
             al.Add("x");
             al.Add("y");
             al.Add(new object());
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string));
         }
 
         [Test]
@@ -456,7 +1028,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Duplicate item found:<System.Object>.")]
         public void UniqueFail()
         {
@@ -470,7 +1042,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Duplicate item found:<System.Object>.test")]
         public void UniqueFailMsg()
         {
@@ -484,7 +1056,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Duplicate item found:<System.Object>.test 1")]
         public void UniqueFailMsgParam()
         {
@@ -497,7 +1069,6 @@
             Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
         }
     }
-
     public class TestComparer : IComparer
     {
         #region IComparer Members
Index: NSpecify.Framework.Specification/ExceptionBehaviourSyntax.cs
===================================================================
--- NSpecify.Framework.Specification/ExceptionBehaviourSyntax.cs	(revision 0)
+++ NSpecify.Framework.Specification/ExceptionBehaviourSyntax.cs	(revision 0)
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using NSpecify.Framework.Exceptions;
+using NUnit.Framework;
+
+namespace NSpecify.Framework.Specification
+{
+    [TestFixture]
+    public class ExceptionBehaviourSyntax
+    {
+        string message = "Exception message";
+        
+        [Test]
+        public void ValidExceptionSyntaxPasses()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException();}).Must.Be.Dissalowed(typeof (CustomException)).WithMessage(message);
+        }
+        [Test]
+        public void ExceptionSpecificationDoesNotNeedToSpecifyMessage()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException(); }).Must.Be.Dissalowed(typeof(CustomException));
+        }
+        [Test, ExpectedException(typeof(SpecificationFailedException))]
+        public void SpecificationFailsIfExceptionIsOfWrongType()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException(); }).Must.Be.Dissalowed(typeof(ArgumentNullException));
+        }
+
+        [Test,ExpectedException(typeof(SpecificationFailedException))]
+        public void SpecificationFailsIfExceptionHasWrongMessage()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException(); }).Must.Be.Dissalowed(typeof(CustomException)).WithMessage("Incorrect Message");
+        }
+
+
+        private void MethodThatThrowsACustomException()
+        {
+            throw new CustomException(message);
+        }
+
+
+
+    }
+    public class CustomException:Exception
+    {
+        public CustomException(string message):base(message)
+        {
+            
+        }
+    }
+    
+
+    
+}
Index: NSpecify.Framework.Specification/CollectionSyntax.cs
===================================================================
--- NSpecify.Framework.Specification/CollectionSyntax.cs	(revision 33)
+++ NSpecify.Framework.Specification/CollectionSyntax.cs	(working copy)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using NSpecify.Framework.Exceptions;
 using NUnit.Framework;
@@ -7,13 +8,584 @@
 namespace NSpecify.Framework.Specification
 {
     [TestFixture]
+    public class GenericCollectionSyntax
+    {
+        public void CollectionSyntaxSpecification()
+        {
+            object actual = new object();
+            ICollection<string> collection = new List<string>();
+            Type type = typeof (string);
+
+            Specify.That(collection).Items.Must.Be.InstanceOf(type);
+            Specify.That(collection).Items.Must.Not.Be.InstanceOf(type);
+
+            Specify.That(collection).Items.Must.Be.Unique();
+            Specify.That(collection).Items.Must.Not.Be.Unique();
+
+            Specify.That(collection).Items.Must.Be.Null();
+            Specify.That(collection).Items.Must.Not.Be.Null();
+
+            Specify.That(collection).Must.Contain(actual);
+            Specify.That(collection).Must.Equal(collection);
+            Specify.That(collection).Must.Be.EquivalentTo(collection);
+            Specify.That(collection).Must.Be.SubsetOf(collection);
+
+            Specify.That(collection).Must.Not.Equal(collection);
+            Specify.That(collection).Must.Not.Contain(actual);
+            Specify.That(collection).Must.Not.Be.EquivalentTo(collection);
+            Specify.That(collection).Must.Not.Be.SubsetOf(collection);
+        }
+
+        private const string typeErrorMsg =
+            "\r\n\tAll objects are not of actual type.\r\n\tset1.Count: 3\r\n\tactual: String";
+
+        private const string notnullErrorMsg = "\r\n\tAt least one object is null.\r\n\tset1.Count: 3";
+        private const string uniqueErrorMsg = "\r\n\tAt least one object is not unique within set1.\r\n\tset1.Count: 3";
+        private const string equalErrorMsg = "\r\n\tset1 and set2 are not equal at index 3";
+        private const string equalCountErrorMsg = "\r\n\tset1 and set2 do not have equal Count properties.";
+        private const string equivalentOneErrorMsg = "\r\n\tAn item from set1 was not found in set2.";
+        private const string equivalentTwoErrorMsg = "\r\n\tAn item from set2 was not found in set1.";
+
+        [Test]
+        public void AreEqual()
+        {
+            IList<string> set1 = new List<string>();
+            IList<string> set2 = new List<string>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("z");
+
+            Specify.That(set2).Must.Equal(set1);
+            Specify.That(set2).Must.Equal(set1, new TestComparer());
+            Specify.That(set2).Must.Equal(set1, "test");
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test");
+            Specify.That(set2).Must.Equal(set1, "test {0}", "1");
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test,
+         ExpectedException(typeof (SpecificationFailedException),
+             "The Elements at index don't match test 1")]
+        public void AreEqualFail()
+        {
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("a");
+
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The number of elements in the collections differ. test 1")]
+        public void AreEqualFailCount()
+        {
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("z");
+            set2.Add("a");
+            
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The Elements at index don't match test 1")]
+        public void AreEqualFailObject()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(a);
+
+            Specify.That(set2).Must.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test]
+        public void AreNotEqual()
+        {
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+            set1.Add("x");
+            set1.Add("y");
+            set1.Add("z");
+            set2.Add("x");
+            set2.Add("y");
+            set2.Add("x");
+
+            Specify.That(set2).Must.Not.Equal(set1);
+            Specify.That(set2).Must.Not.Equal(set1, new TestComparer());
+            Specify.That(set2).Must.Not.Equal(set1, "test");
+            Specify.That(set2).Must.Not.Equal(set1, new TestComparer(), "test");
+            Specify.That(set2).Must.Not.Equal(set1, "test {0}", "1");
+            Specify.That(set2).Must.Not.Equal(set1, new TestComparer(), "test {0}", "1");
+        }
+
+        [Test]
+        public void Contains()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<DataSet> al = new List<DataSet>();
+            al.Add(x);
+            al.Add(y);
+            al.Add(z);
+
+            Specify.That(al).Must.Contain(x);
+            Specify.That(al).Must.Contain(x, "test");
+            Specify.That(al).Must.Contain(x, "test {0}", "1");
+        }
+
+        [Test]
+        public void DoesNotContain()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(y);
+            al.Add(z);
+
+            Specify.That(al).Must.Not.Contain(a);
+            Specify.That(al).Must.Not.Contain(a, "test");
+            Specify.That(al).Must.Not.Contain(a, "test {0}", "1");
+        }
+
+        [Test]
+        public void Equivalent()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            set2.Add(z);
+            set2.Add(y);
+            set2.Add(x);
+
+            Specify.That(set2).Must.Be.EquivalentTo(set1);
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test");
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The expected collection contains 1 occurrence(s) of <System.Data.DataSet>. The actual collection contains 2 occurrence(s). test 1"
+             )]
+        public void EquivalentFailOne()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(x);
+
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "The expected collection contains 2 occurrence(s) of <System.Data.DataSet>. The actual collection contains 1 occurrence(s). test 1"
+             )]
+        public void EquivalentFailTwo()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(x);
+
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(z);
+
+            Specify.That(set2).Must.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test]
+        public void IsNotSubsetOf()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            IList<object> set2 = new List<object>();
+            set1.Add(y);
+            set1.Add(z);
+            set2.Add(a);
+
+            Specify.That(set2).Must.Not.Be.SubsetOf(set1);
+            Specify.That(set2).Must.Not.Be.SubsetOf(set1, "test");
+            Specify.That(set2).Must.Not.Be.SubsetOf(set1, "test {0}", "1");
+        }
+
+        [Test]
+        public void IsSubsetOf()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+            DataSet a = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            IList<object> set2 = new List<object>();
+            set2.Add(y);
+            set2.Add(z);
+
+            Specify.That(set1).Must.Be.SubsetOf(set2);
+            Specify.That(set1).Must.Be.SubsetOf(set2, "test");
+            Specify.That(set1).Must.Be.SubsetOf(set2, "test {0}", "1");
+        }
+
+        [Test]
+        public void ItemsNotNull()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null();
+            Specify.That(al).Items.Must.Not.Be.Null("test");
+            Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
+
+            al = new List<object>();
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+
+            Specify.That(al).Items.Must.Not.Be.Null();
+            Specify.That(al).Items.Must.Not.Be.Null("test");
+            Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
+        }
+
+        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        public void ItemsNotNullFail()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add(null);
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null();
+        }
+
+        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        public void ItemsNotNullFailMsg()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add(null);
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null("test");
+        }
+
+        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        public void ItemsNotNullFailMsgParam()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add(null);
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
+        }
+
+        [Test]
+        public void ItemsOfType()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+
+            al = new List<object>();
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+            al.Add(new DataSet());
+
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test {0}", "1");
+        }
+
+        [Test]
+        [NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+            "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest"
+            )]
+        public void ItemsOfTypeFailMsg()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add(new object());
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest 1"
+             )]
+        public void ItemsOfTypeFailMsgParam()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add(new object());
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Object"
+             )]
+        public void ItemsOfTypeFailNoMsg()
+        {
+            IList<object> al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add(new object());
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
+        }
+
+        [Test]
+        public void NotEquivalent()
+        {
+            DataSet x = new DataSet();
+            DataSet y = new DataSet();
+            DataSet z = new DataSet();
+
+            IList<object> set1 = new List<object>();
+            IList<object> set2 = new List<object>();
+
+            set1.Add(x);
+            set1.Add(y);
+            set1.Add(z);
+
+            set2.Add(x);
+            set2.Add(y);
+            set2.Add(x);
+
+            Specify.That(set2).Must.Not.Be.EquivalentTo(set1);
+            Specify.That(set2).Must.Not.Be.EquivalentTo(set1, "test");
+            Specify.That(set2).Must.Not.Be.EquivalentTo(set1, "test {0}", "1");
+        }
+
+        [Test]
+        public void Unique()
+        {
+            IList<object> al = new List<object>();
+            al.Add(new object());
+            al.Add(new object());
+            al.Add(new object());
+
+            Specify.That(al).Items.Must.Be.Unique();
+            Specify.That(al).Items.Must.Be.Unique("test");
+            Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
+
+            al = new List<object>();
+            al.Add("x");
+            al.Add("y");
+            al.Add("z");
+
+            Specify.That(al).Items.Must.Be.Unique();
+            Specify.That(al).Items.Must.Be.Unique("test");
+            Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Duplicate item found:<System.Object>.")]
+        public void UniqueFail()
+        {
+            object x = new object();
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(new object());
+            al.Add(x);
+
+            Specify.That(al).Items.Must.Be.Unique();
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Duplicate item found:<System.Object>.test")]
+        public void UniqueFailMsg()
+        {
+            object x = new object();
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(new object());
+            al.Add(x);
+
+            Specify.That(al).Items.Must.Be.Unique("test");
+        }
+
+        [Test,
+         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+             "Duplicate item found:<System.Object>.test 1")]
+        public void UniqueFailMsgParam()
+        {
+            object x = new object();
+            IList<object> al = new List<object>();
+            al.Add(x);
+            al.Add(new object());
+            al.Add(x);
+
+            Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
+        }
+        [Test]
+        public void ContainsWithProperty()
+        {
+            string testPropertyValue = "This is the correct value";
+            IList<TestObject> list = new List<TestObject>();
+            TestObject obj1 = new TestObject();
+            TestObject obj2 = new TestObject();
+            TestObject obj3 = new TestObject();
+            
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain(typeof(TestObject)).WithProperty("TestProperty").EqualTo(testPropertyValue);
+        }
+        [Test]
+        public void ContainsInterfaceWithProperty()
+        {
+            string testPropertyValue = "This is the correct value";
+            IList<ITestObject> list = new List<ITestObject>();
+            ITestObject obj1 = new TestObject();
+            ITestObject obj2 = new TestObject();
+            ITestObject obj3 = new TestObject();
+
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain(typeof(ITestObject)).WithProperty("TestProperty").EqualTo(testPropertyValue);
+        }
+        [Test]
+        public void ContainsInterfaceWithIntProperty()
+        {
+            string testPropertyValue = "This is the correct value";
+            int testInt = 1023239;
+            IList<ITestObject> list = new List<ITestObject>();
+            ITestObject obj1 = new TestObject();
+            TestObject obj2 = new TestObject();
+            TestObject obj3 = new TestObject();
+
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            obj3.TestIntProperty = testInt;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain(typeof(ITestObject)).WithProperty("TestIntProperty").EqualTo(testInt);
+        }
+        [Test]
+        public void ContainsInterfaceUsingDelegate()
+        {
+            string testPropertyValue = "This is the correct value";
+            int testInt = 1023239;
+            IList<ITestObject> list = new List<ITestObject>();
+            ITestObject obj1 = new TestObject();
+            TestObject obj2 = new TestObject();
+            TestObject obj3 = new TestObject();
+
+            obj1.TestProperty = "Not Correct";
+            obj3.TestProperty = testPropertyValue;
+            obj3.TestIntProperty = testInt;
+            list.Add(obj1);
+            list.Add(obj2);
+            list.Add(obj3);
+            Specify.That(list).Must.Contain((ITestObject testObject) => {
+                return testObject.TestProperty == testPropertyValue; });
+        }
+        public interface ITestObject
+        {
+            string TestProperty{ get; set;}
+            int TestIntProperty{ get;}
+        }
+        public class TestObject:ITestObject
+        {
+            public string TestProperty{get;set;}
+            public int TestIntProperty { get; set; }
+        }
+
+    }
+    [TestFixture]
     public class CollectionSyntax
     {
         public void CollectionSyntaxSpecification()
         {
             object actual = new object();
             ICollection collection = new ArrayList();
-            Type type = typeof (string);
+            Type type = typeof(string);
 
             Specify.That(collection).Items.Must.Be.InstanceOf(type);
             Specify.That(collection).Items.Must.Not.Be.InstanceOf(type);
@@ -66,7 +638,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The Elements at index don't match test 1")]
         public void AreEqualFail()
         {
@@ -83,7 +655,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The number of elements in the collections differ. test 1")]
         public void AreEqualFailCount()
         {
@@ -101,7 +673,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The Elements at index don't match test 1")]
         public void AreEqualFailObject()
         {
@@ -202,7 +774,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The expected collection contains 1 occurrence(s) of <System.Data.DataSet>. The actual collection contains 2 occurrence(s). test 1"
              )]
         public void EquivalentFailOne()
@@ -226,7 +798,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "The expected collection contains 2 occurrence(s) of <System.Data.DataSet>. The actual collection contains 1 occurrence(s). test 1"
              )]
         public void EquivalentFailTwo()
@@ -316,7 +888,7 @@
             Specify.That(al).Items.Must.Not.Be.Null("test {0}", "1");
         }
 
-        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        [Test, NUnit.Framework.ExpectedException(typeof(SpecificationFailedException), "At least one item is null.")]
         public void ItemsNotNullFail()
         {
             ArrayList al = new ArrayList();
@@ -327,7 +899,7 @@
             Specify.That(al).Items.Must.Not.Be.Null();
         }
 
-        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        [Test, NUnit.Framework.ExpectedException(typeof(SpecificationFailedException), "At least one item is null.")]
         public void ItemsNotNullFailMsg()
         {
             ArrayList al = new ArrayList();
@@ -338,7 +910,7 @@
             Specify.That(al).Items.Must.Not.Be.Null("test");
         }
 
-        [Test, NUnit.Framework.ExpectedException(typeof (SpecificationFailedException), "At least one item is null.")]
+        [Test, NUnit.Framework.ExpectedException(typeof(SpecificationFailedException), "At least one item is null.")]
         public void ItemsNotNullFailMsgParam()
         {
             ArrayList al = new ArrayList();
@@ -357,22 +929,22 @@
             al.Add("y");
             al.Add("z");
 
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test {0}", "1");
 
             al = new ArrayList();
             al.Add(new DataSet());
             al.Add(new DataSet());
             al.Add(new DataSet());
 
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet));
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test");
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (DataSet), "test {0}", "1");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(DataSet));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(DataSet), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(DataSet), "test {0}", "1");
         }
 
         [Test]
-        [NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+        [NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
             "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest"
             )]
         public void ItemsOfTypeFailMsg()
@@ -381,11 +953,11 @@
             al.Add("x");
             al.Add("y");
             al.Add(new object());
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test");
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Objecttest 1"
              )]
         public void ItemsOfTypeFailMsgParam()
@@ -394,11 +966,11 @@
             al.Add("x");
             al.Add("y");
             al.Add(new object());
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string), "test {0}", "1");
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string), "test {0}", "1");
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Element types at index 2 do not match. Type to check is System.String and collection item type is System.Object"
              )]
         public void ItemsOfTypeFailNoMsg()
@@ -407,7 +979,7 @@
             al.Add("x");
             al.Add("y");
             al.Add(new object());
-            Specify.That(al).Items.Must.Be.InstanceOf(typeof (string));
+            Specify.That(al).Items.Must.Be.InstanceOf(typeof(string));
         }
 
         [Test]
@@ -456,7 +1028,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Duplicate item found:<System.Object>.")]
         public void UniqueFail()
         {
@@ -470,7 +1042,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Duplicate item found:<System.Object>.test")]
         public void UniqueFailMsg()
         {
@@ -484,7 +1056,7 @@
         }
 
         [Test,
-         NUnit.Framework.ExpectedException(typeof (SpecificationFailedException),
+         NUnit.Framework.ExpectedException(typeof(SpecificationFailedException),
              "Duplicate item found:<System.Object>.test 1")]
         public void UniqueFailMsgParam()
         {
@@ -497,7 +1069,6 @@
             Specify.That(al).Items.Must.Be.Unique("test {0}", "1");
         }
     }
-
     public class TestComparer : IComparer
     {
         #region IComparer Members
Index: NSpecify.Framework.Specification/ExceptionBehaviourSyntax.cs
===================================================================
--- NSpecify.Framework.Specification/ExceptionBehaviourSyntax.cs	(revision 0)
+++ NSpecify.Framework.Specification/ExceptionBehaviourSyntax.cs	(revision 0)
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using NSpecify.Framework.Exceptions;
+using NUnit.Framework;
+
+namespace NSpecify.Framework.Specification
+{
+    [TestFixture]
+    public class ExceptionBehaviourSyntax
+    {
+        string message = "Exception message";
+        
+        [Test]
+        public void ValidExceptionSyntaxPasses()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException();}).Must.Be.Dissalowed(typeof (CustomException)).WithMessage(message);
+        }
+        [Test]
+        public void ExceptionSpecificationDoesNotNeedToSpecifyMessage()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException(); }).Must.Be.Dissalowed(typeof(CustomException));
+        }
+        [Test, ExpectedException(typeof(SpecificationFailedException))]
+        public void SpecificationFailsIfExceptionIsOfWrongType()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException(); }).Must.Be.Dissalowed(typeof(ArgumentNullException));
+        }
+
+        [Test,ExpectedException(typeof(SpecificationFailedException))]
+        public void SpecificationFailsIfExceptionHasWrongMessage()
+        {
+            Specify.That(() => { MethodThatThrowsACustomException(); }).Must.Be.Dissalowed(typeof(CustomException)).WithMessage("Incorrect Message");
+        }
+
+
+        private void MethodThatThrowsACustomException()
+        {
+            throw new CustomException(message);
+        }
+
+
+
+    }
+    public class CustomException:Exception
+    {
+        public CustomException(string message):base(message)
+        {
+            
+        }
+    }
+    
+
+    
+}
Index: NSpecify.Framework.Specification/NSpecify.Framework.Specification.csproj
===================================================================
--- NSpecify.Framework.Specification/NSpecify.Framework.Specification.csproj	(revision 33)
+++ NSpecify.Framework.Specification/NSpecify.Framework.Specification.csproj	(working copy)
@@ -1,14 +1,20 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C72D7CBE-74AD-44AB-BADF-3B85F8A2BA1F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NSpecify.Framework.Specification</RootNamespace>
     <AssemblyName>NSpecify.Framework.Specification</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,10 +43,14 @@
       <HintPath>..\SharedLibs\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="ExceptionBehaviourSyntax.cs" />
     <Compile Include="GreaterThanSyntax.cs" />
     <Compile Include="CollectionSyntax.cs" />
     <Compile Include="SpecificationExample.cs" />
Index: NSpecify.Framework.Specification/SpecificationExample.cs
===================================================================
--- NSpecify.Framework.Specification/SpecificationExample.cs	(revision 33)
+++ NSpecify.Framework.Specification/SpecificationExample.cs	(working copy)
@@ -57,7 +57,45 @@
 		{
 		}
 	}
+    [Context]
+    public class SaveCustomerFunctionalityWithAlternativeSyntax
+    {
+        private Customer customer = null;
 
+        [BeforeAll]
+        public void FunctionalitySetup()
+        {
+        }
+
+        [BeforeEach]
+        public void SpecificationSetup()
+        {
+            customer = new Customer(123);
+        }
+
+        [Specification("The customer id's should be equal")]
+        public void LoadCustomer()
+        {
+            Specify.That(customer.Id).Must.Equal(123, "The customer id's aren't equal");
+        }
+
+        [Specification("The customer id's should be equal")]
+        public void LoadCustomerFailed()
+        {
+            Specify.That(customer.Id).Must.Not.Equal(125, "The customer id's aren't equal");
+        }
+
+        [AfterEach]
+        public void SpecificationCleanup()
+        {
+            customer = null;
+        }
+
+        [AfterAll]
+        public void FunctionalityCleanup()
+        {
+        }
+    }
 	internal class Customer
 	{
 		private readonly int id;
Index: NSpecify.Framework/Builder/CollectionBehaviourBuilder.cs
===================================================================
--- NSpecify.Framework/Builder/CollectionBehaviourBuilder.cs	(revision 33)
+++ NSpecify.Framework/Builder/CollectionBehaviourBuilder.cs	(working copy)
@@ -1,3 +1,7 @@
+using System.Collections.Generic;
+using System.Reflection;
+using NSpecify.Framework.Exceptions;
+
 namespace NSpecify.Framework.Builder
 {
     using System;
@@ -11,7 +15,7 @@
     /// 
     /// </summary>
     internal class CollectionBehaviourBuilder : ICollectionType, ICollectionDirection, ICollectionNegative, ICollectionExpect, ICollectionItems, IItemDirection, IItemExpect,
-                                                IItemNegative
+                                                IItemNegative, ICollectionItemDirection
     {
         #region Readonly & Static Fields
 
@@ -22,6 +26,8 @@
         #region Fields
 
         private bool isInvert;
+        Type ExpectedItemType;
+        PropertyInfo property;
 
         #endregion
 
@@ -97,6 +103,36 @@
             Contain(expected, string.Empty, null);
         }
 
+        public void Contain<T>(System.Func<T,bool> matchingFunction)
+        {
+            foreach(object item in actual)
+            {
+                if(typeof(T).IsInstanceOfType(item))
+                    if (matchingFunction.Invoke((T)item))
+                        return;
+
+            }
+
+            string message =
+            String.Format("Unable to find matching item in collection");
+            throw new SpecificationFailedException(message);
+        }
+
+        public ICollectionItemDirection Contain(Type type)
+        {
+            foreach (object o in actual)
+            {
+                if(type.IsInstanceOfType(o))
+                {
+                    ExpectedItemType = type;
+                    return this;
+                }
+            }
+            string message =
+                String.Format("Unable to find item of type:{0}", type);
+            throw new SpecificationFailedException(message);
+        }
+
         /// <summary>
         /// Contains the specified expected.
         /// </summary>
@@ -118,6 +154,7 @@
             Verify(new NotContainCollectionVerifier(actual, expected, message, parameters), new ContainCollectionVerifier(actual, expected, message, parameters));
         }
 
+
         /// <summary>
         /// Equals the specified expected.
         /// </summary>
@@ -181,6 +218,42 @@
             Verify(new NotEqualCollectionVerifier(actual, expected, comparer, message, parameters), new EqualCollectionVerifier(actual, expected, comparer, message, parameters));
         }
 
+        public void Equal<T>(ICollection<T> expected)
+        {
+            Equal((ICollection)expected);
+        }
+
+
+        public void Equal<T>(ICollection<T> expected, IComparer comparer)
+        {
+            Equal((ICollection)expected,comparer);
+        }
+
+
+        public void Equal<T>(ICollection<T> expected, string message)
+        {
+            Equal((ICollection)expected,message);
+        }
+
+
+        public void Equal<T>(ICollection<T> expected, IComparer comparer, string message)
+        {
+            Equal((ICollection)expected,comparer,message);
+        }
+
+
+        public void Equal<T>(ICollection<T> expected, string message, params object[] parameters)
+        {
+            Equal((ICollection)expected,message,parameters);
+        }
+
+   
+
+        public void Equal<T>(ICollection<T> expected, IComparer comparer, string message, params object[] parameters)
+        {
+            Equal((ICollection)expected,comparer,message,parameters);
+        }
+
         #endregion
 
         #region ICollectionExpect Members
@@ -272,6 +345,36 @@
             Verify(new NotSubsetOfCollectionVerifier(actual, subset, message, parameters), new SubsetOfCollectionVerifier(actual, subset, message, parameters));
         }
 
+        public void EquivalentTo<T>(ICollection<T> expected)
+        {
+          EquivalentTo((ICollection)expected);
+        }
+
+        public void EquivalentTo<T>(ICollection<T> expected, string message)
+        {
+            EquivalentTo((ICollection)expected,message);
+        }
+
+        public void EquivalentTo<T>(ICollection<T> expected, string message, params object[] parameters)
+        {
+            EquivalentTo((ICollection)expected,message,parameters);
+        }
+
+        public void SubsetOf<T>(ICollection<T> subset)
+        {
+            SubsetOf((ICollection)subset);
+        }
+
+        public void SubsetOf<T>(ICollection<T> subset, string message)
+        {
+            SubsetOf((ICollection)subset,message);
+        }
+
+        public void SubsetOf<T>(ICollection<T> subset, string message, params object[] parameters)
+        {
+            SubsetOf((ICollection)subset,message,parameters);
+        }
+
         #endregion
 
         #region ICollectionItems Members
@@ -443,5 +546,44 @@
         }
 
         #endregion
+
+        public ICollectionItemDirection WithProperty(string propertyName)
+        {
+            foreach (PropertyInfo propertyInfo in ExpectedItemType.GetProperties())
+            {
+                if(propertyInfo.Name == propertyName)
+                {
+                    property = propertyInfo;
+                    return this;
+                }
+            }
+            string message =
+              String.Format("Unable to find item of type:{0} with property {1}", ExpectedItemType,
+                            propertyName);
+            throw new SpecificationFailedException(message);          
+
+        }
+
+        public void EqualTo(object value)
+        {
+
+            foreach (object item in actual)
+            {
+                if (ExpectedItemType.IsInstanceOfType(item))
+                {
+                    object valueInItem = property.GetValue(item, null);
+                    
+                    if (valueInItem.Equals(value))
+                    {
+                        return;
+                    }
+                }
+            }
+            string message =
+                String.Format("Unable to find item of type:{0} with property {1} holding value {2}", ExpectedItemType,
+                              property.Name, value);
+            throw new SpecificationFailedException(message);
+            
+        }
     }
 }
\ No newline at end of file
Index: NSpecify.Framework/Builder/MethodBehaviourBuilder.cs
===================================================================
--- NSpecify.Framework/Builder/MethodBehaviourBuilder.cs	(revision 0)
+++ NSpecify.Framework/Builder/MethodBehaviourBuilder.cs	(revision 0)
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NSpecify.Framework.Exceptions;
+using NSpecify.Framework.Syntax;
+
+namespace NSpecify.Framework.Builder
+{
+    public class MethodBehaviourBuilder:IMethodType,IMethodBehaviour,IExceptionBehaviour
+    {
+        readonly Action method;
+        string message;
+        public MethodBehaviourBuilder(Action method)
+        {
+            this.method = method;
+        }
+
+        public IMethodBehaviour Must
+        {
+            get { return this; }
+        }
+        public IMethodBehaviour Be
+        {
+            get { return this; }
+        }
+        public IExceptionBehaviour Dissalowed(Type exceptionType)
+        {
+            string errMessage =
+                String.Format("Specified method to thow exception of type:{0}. Instead got No exception", exceptionType);
+            try
+            {
+                method.Invoke();
+            }
+            catch(Exception e)
+            {
+                if (!e.GetType().Equals(exceptionType))
+                {
+                    errMessage =
+                        string.Format(
+                            "Specified method to thow exception of type:{0}. Instead got exception of type {1} and message: {2}",exceptionType,e.GetType(),e.Message);
+                    
+                }
+                else
+                {
+                    message = e.Message;
+                    return this;
+                }
+            }
+            throw new SpecificationFailedException(errMessage);
+
+        }
+
+
+        public void WithMessage(string expectedMessage)
+        {
+            if (!expectedMessage.Equals(message))
+            {
+                string errMessage =
+                      string.Format(
+                          "Specified method to thow exception with message:{0}. Instead got exception message: {1}", expectedMessage, message);
+                throw new SpecificationFailedException(errMessage);
+            }
+        }
+    }
+}
Index: NSpecify.Framework/CleanupFunctionalityAttribute.cs
===================================================================
--- NSpecify.Framework/CleanupFunctionalityAttribute.cs	(revision 33)
+++ NSpecify.Framework/CleanupFunctionalityAttribute.cs	(working copy)
@@ -6,7 +6,12 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class CleanupFunctionalityAttribute : Attribute
+    public class CleanupFunctionalityAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class AfterAllAttribute : CleanupFunctionalityAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/DestroyResourcesAttribute.cs
===================================================================
--- NSpecify.Framework/DestroyResourcesAttribute.cs	(revision 33)
+++ NSpecify.Framework/DestroyResourcesAttribute.cs	(working copy)
@@ -6,7 +6,12 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class DestroyResourcesAttribute : Attribute
+    public class DestroyResourcesAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class AfterEachAttribute : Attribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/FunctionalityAttribute.cs
===================================================================
--- NSpecify.Framework/FunctionalityAttribute.cs	(revision 33)
+++ NSpecify.Framework/FunctionalityAttribute.cs	(working copy)
@@ -6,7 +6,7 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-    public sealed class FunctionalityAttribute : Attribute
+    public class FunctionalityAttribute : Attribute
     {
         #region Fields
 
@@ -24,7 +24,15 @@
         {
             this.description = description;
         }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FunctionalityAttribute"/> class.
+        /// </summary>
+        public FunctionalityAttribute()
+        {
+            description = string.Empty;
+        }
 
+
         #endregion
 
         #region Instance Properties
@@ -41,4 +49,9 @@
 
         #endregion
     }
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public sealed class ContextAttribute:FunctionalityAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/InitializeFunctionalityAttribute.cs
===================================================================
--- NSpecify.Framework/InitializeFunctionalityAttribute.cs	(revision 33)
+++ NSpecify.Framework/InitializeFunctionalityAttribute.cs	(working copy)
@@ -6,7 +6,12 @@
     /// 
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class InitializeFunctionalityAttribute : Attribute
+    public class InitializeFunctionalityAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class BeforeAllAttribute:InitializeFunctionalityAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/NSpecify.Framework.csproj
===================================================================
--- NSpecify.Framework/NSpecify.Framework.csproj	(revision 33)
+++ NSpecify.Framework/NSpecify.Framework.csproj	(working copy)
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C76774A3-FE94-42A7-A413-DD802E47BDD6}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -17,6 +17,12 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,10 +44,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Builder\MethodBehaviourBuilder.cs" />
     <Compile Include="GroupAttribute.cs" />
     <Compile Include="Exceptions\SpecificationFailedException.cs" />
     <Compile Include="Exceptions\SpecificationIgnoreException.cs" />
@@ -58,6 +68,7 @@
     <Compile Include="SetupResourcesAttribute.cs" />
     <Compile Include="Builder\FileBehaviourBuilder.cs" />
     <Compile Include="Syntax\IBooleanVerification.cs" />
+    <Compile Include="Syntax\ICollectionItemDirection.cs" />
     <Compile Include="Syntax\ICollectionVerification.cs" />
     <Compile Include="Syntax\IFileDirection.cs" />
     <Compile Include="Syntax\IFileNegative.cs" />
@@ -69,6 +80,8 @@
     <Compile Include="Syntax\IItemExpect.cs" />
     <Compile Include="Syntax\IItemNegative.cs" />
     <Compile Include="Syntax\ICollectionItems.cs" />
+    <Compile Include="Syntax\IMethodBehaviour.cs" />
+    <Compile Include="Syntax\IMethodType.cs" />
     <Compile Include="Syntax\IObjectVerification.cs" />
     <Compile Include="Syntax\IStringCaseIgnoring.cs" />
     <Compile Include="Syntax\IStringNegative.cs" />
Index: NSpecify.Framework/SetupResourcesAttribute.cs
===================================================================
--- NSpecify.Framework/SetupResourcesAttribute.cs	(revision 33)
+++ NSpecify.Framework/SetupResourcesAttribute.cs	(working copy)
@@ -3,7 +3,12 @@
     using System;
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class SetupResourcesAttribute : Attribute
+    public class SetupResourcesAttribute : Attribute
     {
     }
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class BeforeEachAttribute : SetupResourcesAttribute
+    {
+        
+    }
 }
\ No newline at end of file
Index: NSpecify.Framework/SpecificationAttribute.cs
===================================================================
--- NSpecify.Framework/SpecificationAttribute.cs	(revision 33)
+++ NSpecify.Framework/SpecificationAttribute.cs	(working copy)
@@ -1,3 +1,5 @@
+using System.Text.RegularExpressions;
+
 namespace NSpecify.Framework
 {
     using System;
@@ -6,6 +8,7 @@
     /// The specification attribute
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    
     public class SpecificationAttribute : Attribute
     {
         #region Fields
@@ -24,7 +27,14 @@
         {
             this.description = description;
         }
-
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SpecificationAttribute"/> class.
+        /// creates a description based on the method name
+        /// </summary>
+        public SpecificationAttribute()
+        {
+            description = string.Empty;
+        }
         #endregion
 
         #region Instance Properties
Index: NSpecify.Framework/Specify.cs
===================================================================
--- NSpecify.Framework/Specify.cs	(revision 33)
+++ NSpecify.Framework/Specify.cs	(working copy)
@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
 namespace NSpecify.Framework
 {
     using System.Collections;
@@ -60,6 +64,10 @@
         {
             return new CollectionBehaviourBuilder(collection);
         }
+        public static ICollectionType That<T>(ICollection<T> collection)
+        {
+            return new CollectionBehaviourBuilder((ICollection)collection);
+        }
 
         public static IStringType That(string value)
         {
@@ -75,6 +83,10 @@
         {
             return new FileBehaviourBuilder(stream);
         }
+        public static IMethodType That(Action method)
+        {
+            return new MethodBehaviourBuilder(method);
+        }
 
         public static void ToFail()
         {
Index: NSpecify.Framework/Syntax/ICollectionDirection.cs
===================================================================
--- NSpecify.Framework/Syntax/ICollectionDirection.cs	(revision 33)
+++ NSpecify.Framework/Syntax/ICollectionDirection.cs	(working copy)
@@ -1,3 +1,6 @@
+using System;
+using System.Collections.Generic;
+
 namespace NSpecify.Framework.Syntax
 {
     using System.Collections;
@@ -25,6 +28,7 @@
 
         #region Instance Methods
 
+        #region generic
         /// <summary>
         /// Contains the specified expected.
         /// </summary>
@@ -34,6 +38,14 @@
         /// <summary>
         /// Contains the specified expected.
         /// </summary>
+        /// <param name="type">The type expected in the collection.</param>
+        ICollectionItemDirection Contain(Type type);
+
+        void Contain<T>(System.Func<T,bool> matchingFunction);
+
+        /// <summary>
+        /// Contains the specified expected.
+        /// </summary>
         /// <param name="expected">The expected.</param>
         /// <param name="message">The message.</param>
         void Contain(object expected, string message);
@@ -50,6 +62,53 @@
         /// Equals the specified expected.
         /// </summary>
         /// <param name="expected">The expected.</param>
+        void Equal<T>(ICollection<T> expected);
+
+        /// <summary>
+        /// Equals the specified expected.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="comparer">The comparer.</param>
+        void Equal<T>(ICollection<T> expected, IComparer comparer);
+
+        /// <summary>
+        /// Equals the specified expected.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="message">The message.</param>
+        void Equal<T>(ICollection<T> expected, string message);
+
+        /// <summary>
+        /// Equals the specified expected.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="comparer">The comparer.</param>
+        /// <param name="message">The message.</param>
+        void Equal<T>(ICollection<T> expected, IComparer comparer, string message);
+
+        /// <summary>
+        /// Equals the specified expected.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="message">The message.</param>
+        /// <param name="parameters">The parameters.</param>
+        void Equal<T>(ICollection<T> expected, string message, params object[] parameters);
+
+        /// <summary>
+        /// Equals the specified expected.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="comparer">The comparer.</param>
+        /// <param name="message">The message.</param>
+        /// <param name="parameters">The parameters.</param>
+        void Equal<T>(ICollection<T> expected, IComparer comparer, string message, params object[] parameters);
+        #endregion
+
+        #region non generic
+        /// <summary>
+        /// Equals the specified expected.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
         void Equal(ICollection expected);
 
         /// <summary>
@@ -90,6 +149,7 @@
         /// <param name="message">The message.</param>
         /// <param name="parameters">The parameters.</param>
         void Equal(ICollection expected, IComparer comparer, string message, params object[] parameters);
+        #endregion
 
         #endregion
     }
Index: NSpecify.Framework/Syntax/ICollectionExpect.cs
===================================================================
--- NSpecify.Framework/Syntax/ICollectionExpect.cs	(revision 33)
+++ NSpecify.Framework/Syntax/ICollectionExpect.cs	(working copy)
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace NSpecify.Framework.Syntax
 {
     using System.Collections;
@@ -27,6 +29,7 @@
         /// <param name="parameters">The parameters.</param>
         void Empty(string message, params object[] parameters);
 
+        #region non generic
         /// <summary>
         /// Equivalents to.
         /// </summary>
@@ -68,7 +71,51 @@
         /// <param name="message">The message.</param>
         /// <param name="parameters">The parameters.</param>
         void SubsetOf(ICollection subset, string message, params object[] parameters);
+        #endregion
 
+        #region generic
+        /// <summary>
+        /// Equivalents to.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        void EquivalentTo<T>(ICollection<T> expected);
+
+        /// <summary>
+        /// Equivalents to.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="message">The message.</param>
+        void EquivalentTo<T>(ICollection<T> expected, string message);
+
+        /// <summary>
+        /// Equivalents to.
+        /// </summary>
+        /// <param name="expected">The expected.</param>
+        /// <param name="message">The message.</param>
+        /// <param name="parameters">The parameters.</param>
+        void EquivalentTo<T>(ICollection<T> expected, string message, params object[] parameters);
+
+        /// <summary>
+        /// Subsets the of.
+        /// </summary>
+        /// <param name="subset">The subset.</param>
+        void SubsetOf<T>(ICollection<T> subset);
+
+        /// <summary>
+        /// Subsets the of.
+        /// </summary>
+        /// <param name="subset">The subset.</param>
+        /// <param name="message">The message.</param>
+        void SubsetOf<T>(ICollection<T> subset, string message);
+
+        /// <summary>
+        /// Subsets the of.
+        /// </summary>
+        /// <param name="subset">The subset.</param>
+        /// <param name="message">The message.</param>
+        /// <param name="parameters">The parameters.</param>
+        void SubsetOf<T>(ICollection<T> subset, string mes