Commit 162eb40

@@ -1,9 +0,0 @@
-using MbUnit.Framework;
-
-namespace MoMoney.Testing.spechelpers.core
-{
-    [TestFixture]
-    public class empty_fixture
-    {
-    }
-}
\ No newline at end of file

@@ -4,9 +4,9 @@ using System.Linq;
 using JetBrains.Annotations;
 using MbUnit.Framework;
 
-namespace MoMoney.Testing.spechelpers.core
+namespace Gorilla.Commons.Testing
 {
-    public static class assertions
+    public static class Assertions
     {
         [AssertionMethod]
         public static void should_be_equal_to<T>(this T item_to_validate, T expected_value)

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Testing
+namespace Gorilla.Commons.Testing
 {
     public class call
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Testing.MetaData
+namespace Gorilla.Commons.Testing
 {
     public class ConcernAttribute : bdddoc.core.ConcernAttribute
     {

@@ -1,8 +1,7 @@
 using developwithpassion.bdd.mbunit.standard.observations;
-using MoMoney.Testing.spechelpers.core;
 using Rhino.Mocks;
 
-namespace MoMoney.Testing.spechelpers.contexts
+namespace Gorilla.Commons.Testing
 {
     public abstract class concerns_for<Contract> : observations_for_a_sut_without_a_contract<Contract>,
                                                    IHideObjectMembers
@@ -35,7 +34,7 @@ namespace MoMoney.Testing.spechelpers.contexts
             return MockRepository.GenerateMock<T>();
         }
 
-        public static T when_the<T>(T item)
+        static protected T when_the<T>(T item)
         {
             return item;
         }

@@ -0,0 +1,9 @@
+using MbUnit.Framework;
+
+namespace Gorilla.Commons.Testing
+{
+    [TestFixture]
+    public class EmptyFixture
+    {
+    }
+}
\ No newline at end of file

@@ -66,14 +66,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Call.cs" />
-    <Compile Include="MetaData\ConcernAttribute.cs" />
-    <Compile Include="MetaData\IntegrationAttribute.cs" />
-    <Compile Include="SpecHelpers\Contexts\concerns.cs" />
-    <Compile Include="SpecHelpers\Core\assertions.cs" />
-    <Compile Include="SpecHelpers\Core\empty_fixture.cs" />
-    <Compile Include="SpecHelpers\Core\IHideObjectMembers.cs" />
-    <Compile Include="SpecHelpers\Core\MethodCallOccurance.cs" />
-    <Compile Include="SpecHelpers\Core\mocking_extensions.cs" />
+    <Compile Include="ConcernAttribute.cs" />
+    <Compile Include="IntegrationAttribute.cs" />
+    <Compile Include="concerns.cs" />
+    <Compile Include="assertions.cs" />
+    <Compile Include="EmptyFixture.cs" />
+    <Compile Include="IHideObjectMembers.cs" />
+    <Compile Include="MethodCallOccurance.cs" />
+    <Compile Include="MockingExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel;
 
-namespace MoMoney.Testing.spechelpers.core
+namespace Gorilla.Commons.Testing
 {
     [EditorBrowsable(EditorBrowsableState.Never)]
     public interface IHideObjectMembers

@@ -1,6 +1,6 @@
 using MbUnit.Framework;
 
-namespace MoMoney.Testing.MetaData
+namespace Gorilla.Commons.Testing
 {
     public class IntegrationAttribute : FixtureCategoryAttribute
     {

@@ -1,7 +1,7 @@
 using System;
 using Rhino.Mocks;
 
-namespace MoMoney.Testing.spechelpers.core
+namespace Gorilla.Commons.Testing
 {
     public class MethodCallOccurance<T> : IHideObjectMembers
     {

@@ -4,7 +4,7 @@ using System.Linq;
 using Rhino.Mocks;
 using Rhino.Mocks.Interfaces;
 
-namespace MoMoney.Testing.spechelpers.core
+namespace Gorilla.Commons.Testing
 {
     public static class MockingExtensions
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class ActionCommand : ICommand
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class AndSpecification<T> : ISpecification<T>
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class AnonymousDisposable : IDisposable
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class ChainedCommand : ICommand
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class ChainedConfiguration<T> : IConfiguration<T>
     {

@@ -1,11 +1,11 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
-    public class chained_mapper<Left, Middle, Right> : IMapper<Left, Right>
+    public class ChainedMapper<Left, Middle, Right> : IMapper<Left, Right>
     {
         private readonly IMapper<Left, Middle> left;
         private readonly IMapper<Middle, Right> right;
 
-        public chained_mapper(IMapper<Left, Middle> left, IMapper<Middle, Right> right)
+        public ChainedMapper(IMapper<Left, Middle> left, IMapper<Middle, Right> right)
         {
             this.left = left;
             this.right = right;

@@ -1,6 +1,7 @@
 using System;
+using MoMoney.Utility.Core;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class DisposableCommand : IDisposableCommand
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class EmptyCallback<T> : ICallback<T>, ICallback
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class EmptyCommand : ICommand
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IComponentFactory<T> : IFactory<T> where T : new()
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IBuilder<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface ICallback : ICommand
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface ICommand
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IConfiguration<T>
     {

@@ -1,4 +1,5 @@
 using System;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Utility.Core
 {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IFactory<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IMapper<Input, Output>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IParameterizedCommand<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IQuery<T>
     {

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IRegistry<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface ISpecification<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IState
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IStateContext<T> where T : IState
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IValueReturningVisitor<Value, T> : IVisitor<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IVisitable<T>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public interface IVisitor<T>
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class Map<Input, Output> : IMapper<Input, Output>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class OrSpecification<T> : ISpecification<T>
     {

@@ -1,8 +1,7 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public abstract class when_checking_if_one_of_two_conditions_are_met :
         concerns_for<ISpecification<int>, OrSpecification<int>>

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     public class PredicateSpecification<T> : ISpecification<T>
     {

@@ -1,9 +1,7 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
-namespace MoMoney.Utility.Core
+namespace Gorilla.Commons.Utility.Core
 {
     [Concern(typeof (PredicateSpecification<>))]
     public class when_checking_if_a_criteria_is_met_and_it_is : concerns

@@ -1,30 +1,23 @@
 using System;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
-    public static class CommandExtensions
+    static public class CommandExtensions
     {
-        public static ICommand then<Command>(this ICommand left) where Command : ICommand, new()
+        static public ICommand then<Command>(this ICommand left) where Command : ICommand, new()
         {
             return then(left, new Command());
         }
 
-        public static ICommand then(this ICommand left, ICommand right)
+        static public ICommand then(this ICommand left, ICommand right)
         {
             return new ChainedCommand(left, right);
         }
 
-        public static ICommand then(this ICommand left, Action right)
+        static public ICommand then(this ICommand left, Action right)
         {
             return new ChainedCommand(left, new ActionCommand(right));
         }
-
-        //public static ICommand as_command_chain(this IEnumerable<ICommand> commands)
-        //{
-        //    var processor = new CommandProcessor();
-        //    commands.each(processor.add);
-        //    return processor;
-        //}
     }
 }
\ No newline at end of file

@@ -1,8 +1,8 @@
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
-    public static class configuration_extensions
+    public static class ConfigurationExtensions
     {
         public static IConfiguration<T> then<T>(this IConfiguration<T> first, IConfiguration<T> second)
         {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public static class ConversionExtensions
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public static class EnumerableExtensions
     {

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public class EnumerableExtensionsSpecs
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public static class FuncExtensions
     {

@@ -1,12 +1,11 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Utility.Extensions
 {
-    [Concern(typeof (mapping_extensions))]
+    [Concern(typeof (MappingExtensions))]
     public class when_transforming_type_A_to_type_B_then_C : concerns
     {
         it should_return_the_correct_result = () => result.should_be_equal_to(1);

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
-    public static class mapping_extensions
+    public static class MappingExtensions
     {
         public static Output map_using<Input, Output>(this Input item, Converter<Input, Output> conversion)
         {
@@ -27,7 +27,7 @@ namespace MoMoney.Utility.Extensions
         public static IMapper<Left, Right> then<Left, Middle, Right>(this IMapper<Left, Middle> left,
                                                                      IMapper<Middle, Right> right)
         {
-            return new chained_mapper<Left, Middle, Right>(left, right);
+            return new ChainedMapper<Left, Middle, Right>(left, right);
         }
     }
 }
\ No newline at end of file

@@ -1,6 +1,6 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Utility.Extensions
 {

@@ -1,8 +1,8 @@
 using System;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
-    public static class numeric_conversions
+    public static class NumericConversions
     {
         public static int to_int<T>(this T item) where T : IConvertible
         {

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public static class RegistryExtensions
     {

@@ -1,28 +0,0 @@
-using System;
-using MoMoney.Utility.Core;
-
-namespace MoMoney.Utility.Extensions
-{
-    public static class specification_extensions
-    {
-        public static bool satisfies<T>(this T item_to_interrogate, Predicate<T> criteria_to_satisfy)
-        {
-            return criteria_to_satisfy(item_to_interrogate);
-        }
-
-        public static bool satisfies<T>(this T itemToValidate, ISpecification<T> criteriaToSatisfy)
-        {
-            return itemToValidate.satisfies(criteriaToSatisfy.is_satisfied_by);
-        }
-
-        public static ISpecification<T> and<T>(this ISpecification<T> left, ISpecification<T> right)
-        {
-            return new AndSpecification<T>(left, right);
-        }
-
-        public static ISpecification<T> or<T>(this ISpecification<T> left, ISpecification<T> right)
-        {
-            return new OrSpecification<T>(left, right);
-        }
-    }
-}
\ No newline at end of file

@@ -0,0 +1,28 @@
+using System;
+using Gorilla.Commons.Utility.Core;
+
+namespace Gorilla.Commons.Utility.Extensions
+{
+    static public class SpecificationExtensions
+    {
+        static public bool satisfies<T>(this T item_to_interrogate, Predicate<T> criteria_to_satisfy)
+        {
+            return criteria_to_satisfy(item_to_interrogate);
+        }
+
+        static public bool satisfies<T>(this T item_to_validate, ISpecification<T> criteria_to_satisfy)
+        {
+            return item_to_validate.satisfies(criteria_to_satisfy.is_satisfied_by);
+        }
+
+        static public ISpecification<T> and<T>(this ISpecification<T> left, ISpecification<T> right)
+        {
+            return new AndSpecification<T>(left, right);
+        }
+
+        static public ISpecification<T> or<T>(this ISpecification<T> left, ISpecification<T> right)
+        {
+            return new OrSpecification<T>(left, right);
+        }
+    }
+}
\ No newline at end of file

@@ -1,9 +1,8 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public class when_evaluating_two_conditions : concerns
     {
@@ -13,8 +12,8 @@ namespace MoMoney.Utility.Extensions
                             right = an<ISpecification<int>>();
                         };
 
-        protected static ISpecification<int> left;
-        protected static ISpecification<int> right;
+        static protected ISpecification<int> left;
+        static protected ISpecification<int> right;
     }
 
     public class when_checking_if_two_conditions_are_met_and_they_are : when_evaluating_two_conditions
@@ -47,7 +46,8 @@ namespace MoMoney.Utility.Extensions
         static bool result;
     }
 
-    public class when_checking_if_one_of_two_conditions_are_met_and_the_right_one_is_not : when_evaluating_two_conditions
+    public class when_checking_if_one_of_two_conditions_are_met_and_the_right_one_is_not :
+        when_evaluating_two_conditions
     {
         it should_return_true = () => result.should_be_true();
 

@@ -1,4 +1,4 @@
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public static class StringExtensions
     {

@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using System.Reflection;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public static class TypeExtensions
     {

@@ -1,9 +1,8 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
     public class when_getting_the_last_interface_for_a_type : concerns
     {
@@ -19,8 +18,8 @@ namespace MoMoney.Utility.Extensions
     public class when_checking_if_a_type_represents_a_generic_type_definition : concerns
     {
         it should_tell_the_truth = () => { 
-            typeof (IRegistry<>).is_a_generic_type().should_be_true();
-            typeof (IRegistry<int>).is_a_generic_type().should_be_false();
+                                             typeof (IRegistry<>).is_a_generic_type().should_be_true();
+                                             typeof (IRegistry<int>).is_a_generic_type().should_be_false();
         };
     }
 

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Utility.Extensions
+namespace Gorilla.Commons.Utility.Extensions
 {
-    public static class visitor_extensions
+    public static class VisitorExtensions
     {
         public static Result return_value_from_visiting_all_items_with<Result, T>(this IEnumerable<T> items,
                                                                                   IValueReturningVisitor<Result, T>

@@ -62,7 +62,7 @@
     <Compile Include="Core\AnonymousDisposable.cs" />
     <Compile Include="Core\ChainedCommand.cs" />
     <Compile Include="Core\ChainedConfiguration.cs" />
-    <Compile Include="Core\chained_mapper.cs" />
+    <Compile Include="Core\ChainedMapper.cs" />
     <Compile Include="Core\DisposableCommand.cs" />
     <Compile Include="Core\EmptyCallback.cs" />
     <Compile Include="Core\EmptyCommand.cs" />
@@ -89,22 +89,22 @@
     <Compile Include="Core\PredicateSpecification.cs" />
     <Compile Include="Core\PredicateSpecificationSpecs.cs" />
     <Compile Include="Extensions\CommandExtensions.cs" />
-    <Compile Include="Extensions\configuration_extensions.cs" />
+    <Compile Include="Extensions\ConfigurationExtensions.cs" />
     <Compile Include="Extensions\ConversionExtensions.cs" />
     <Compile Include="Extensions\EnumerableExtensions.cs" />
     <Compile Include="Extensions\EnumerableExtensionsSpecs.cs" />
     <Compile Include="Extensions\FuncExtensions.cs" />
-    <Compile Include="Extensions\mapping_extensions.cs" />
+    <Compile Include="Extensions\MappingExtensions.cs" />
     <Compile Include="Extensions\mapping_extensions_specs.cs" />
-    <Compile Include="Extensions\numeric_conversions.cs" />
+    <Compile Include="Extensions\NumericConversions.cs" />
     <Compile Include="Extensions\numeric_conversions_specs.cs" />
     <Compile Include="Extensions\RegistryExtensions.cs" />
     <Compile Include="Extensions\SpecificationExtensionsSpecs.cs" />
-    <Compile Include="Extensions\specification_extensions.cs" />
+    <Compile Include="Extensions\SpecificationExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
     <Compile Include="Extensions\TypeExtensionsSpecs.cs" />
-    <Compile Include="Extensions\visitor_extensions.cs" />
+    <Compile Include="Extensions\VisitorExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Gorilla.Commons.Testing\Gorilla.Commons.Testing.csproj">

@@ -1,6 +1,6 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.proxies;
 using MoMoney.Infrastructure.Threading;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {

@@ -1,10 +1,10 @@
 using System;
 using System.Reflection;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.Container.Windsor.configuration;
 using MoMoney.Infrastructure.reflection;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,11 +1,10 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MbUnit.Framework;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.Container.Windsor.configuration;
 using MoMoney.Infrastructure.reflection;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,8 +1,8 @@
 using Castle.MicroKernel.Registration;
 using Castle.Windsor;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container.Windsor;
 using MoMoney.Infrastructure.Container.Windsor.configuration;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,6 +1,6 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.proxies;
 using MoMoney.Infrastructure.Threading;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,8 +1,8 @@
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DataAccess.db40;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.transactions2;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.boot.container.registration
 {

@@ -2,12 +2,12 @@ using System.ComponentModel;
 using System.Deployment.Application;
 using System.Threading;
 using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.Logging;
 using MoMoney.Infrastructure.Logging.Log4NetLogging;
 using MoMoney.Infrastructure.Threading;
 using MoMoney.Tasks.infrastructure.updating;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,3 +1,4 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.registries;
@@ -5,7 +6,6 @@ using MoMoney.Infrastructure.Threading;
 using MoMoney.Infrastructure.transactions;
 using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,5 +1,7 @@
 using System;
 using System.Reflection;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.interceptors;
 using MoMoney.Infrastructure.reflection;
@@ -10,8 +12,6 @@ using MoMoney.Presentation.Model.Menu.Help;
 using MoMoney.Presentation.Model.Menu.window;
 using MoMoney.Presentation.Presenters.Commands;
 using MoMoney.Presentation.Views.Shell;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,7 +1,7 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Presentation.Views.billing;
 using MoMoney.Presentation.Views.reporting;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,3 +1,4 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.DataAccess.core;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.repositories;
@@ -5,7 +6,6 @@ using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.interceptors;
 using MoMoney.Infrastructure.proxies;
 using MoMoney.Tasks.application;
-using MoMoney.Utility.Core;
 using IUnitOfWorkInterceptor=MoMoney.Infrastructure.transactions2.IUnitOfWorkInterceptor;
 
 namespace MoMoney.boot.container.registration

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Presentation.Views;
 using MoMoney.Presentation.Views.billing;
@@ -10,7 +11,6 @@ using MoMoney.Presentation.Views.Navigation;
 using MoMoney.Presentation.Views.Shell;
 using MoMoney.Presentation.Views.Startup;
 using MoMoney.Presentation.Views.updates;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot.container
 {

@@ -1,9 +1,9 @@
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.boot.container.registration;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.Container.Autofac;
 using MoMoney.Infrastructure.Container.Windsor.configuration;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.boot.container
 {

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.Extensions;
 using MoMoney.Presentation.Model.messages;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.boot
 {

@@ -1,4 +1,4 @@
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.windows.ui
 {

@@ -1,7 +1,7 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.interceptors;
 using MoMoney.Infrastructure.Threading;
 using MoMoney.Modules.Core;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.boot
 {

@@ -6,14 +6,14 @@ using System.Globalization;
 using System.Security.Principal;
 using System.Threading;
 using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.boot.container;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.eventing;
 using MoMoney.Infrastructure.Extensions;
 using MoMoney.Presentation.Model.messages;
 using MoMoney.Presentation.Presenters.Startup;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 using MoMoney.windows.ui;
 using display_the_splash_screen=MoMoney.Presentation.Presenters.Commands.display_the_splash_screen;
 

@@ -2,10 +2,8 @@ using System.Collections.Generic;
 using System.IO;
 using Db4objects.Db4o;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.DataAccess.db40.spiking
 {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.DataAccess.db40
 {

@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.DataAccess.core;
 using MoMoney.Domain.Core;
 using MoMoney.Infrastructure.transactions2;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.DataAccess.db40
 {

@@ -1,9 +1,7 @@
 using Db4objects.Db4o;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Model.Projects;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.DataAccess.db40
 {

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.Core;
 using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.DataAccess.repositories
 {

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DataAccess.core;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.repositories;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.DataAccess.repositories
 {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.Domain.accounting.billing
 {

@@ -1,9 +1,7 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Domain.Core;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Domain.accounting.billing
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Domain.repositories;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Domain.accounting.billing
 {

@@ -1,5 +1,5 @@
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Domain.Core;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Domain.accounting.billing
 {

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.accounting.financial_growth;
 using MoMoney.Domain.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.Domain.accounting
 {

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.accounting.financial_growth;
 using MoMoney.Domain.Core;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Domain.accounting
 {

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.Domain.accounting
 {

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.Core;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Domain.accounting
 {
@@ -38,7 +36,7 @@ namespace MoMoney.Domain.accounting
                                                                      };
 
         it should_not_return_any_entries_that_were_not_posted_for_that_month =
-            () => assertions.should_not_contain(result, april_first);
+            () => Assertions.should_not_contain(result, april_first);
 
         context c = () =>
                         {

@@ -1,6 +1,6 @@
 using System;
 using System.Globalization;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,7 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,4 +1,4 @@
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,6 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,7 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,6 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,7 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Domain.Core
 {

@@ -1,10 +1,8 @@
 using System;
 using System.IO;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MbUnit.Framework;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Infrastructure.cloning
 {

@@ -3,9 +3,9 @@ using Autofac;
 using Autofac.Builder;
 using Autofac.Modules;
 using AutofacContrib.DynamicProxy2;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.proxies;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.Container.Autofac
 {

@@ -4,8 +4,7 @@ using Autofac;
 using Autofac.Builder;
 using Autofac.Modules;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.Container.Autofac
 {

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.Container.Windsor.configuration
 {

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Domain.Core;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Infrastructure.Container.Windsor.configuration
 {

@@ -1,6 +1,6 @@
 using Castle.MicroKernel.Registration;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.Container.Windsor.configuration
 {

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Container.Windsor.configuration
 {

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Domain.Core;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Container.Windsor.configuration
 {

@@ -1,7 +1,7 @@
 using System;
 using Castle.MicroKernel.Registration;
 using Castle.Windsor;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Container.Windsor
 {

@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using Castle.Core;
 using Castle.Windsor;
+using Gorilla.Commons.Utility.Core;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.proxies;
-using MoMoney.Utility.Core;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.Container.Windsor
 {

@@ -1,9 +1,7 @@
 using Castle.Core;
 using Castle.Windsor;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.Container.Windsor
 {

@@ -1,5 +1,5 @@
 using System;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.Container
 {

@@ -1,6 +1,6 @@
 using System;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.proxies;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Container
 {

@@ -1,10 +1,7 @@
 using System;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Presentation.Core;
-using MoMoney.Testing;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Infrastructure.Container
 {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.eventing
 {

@@ -1,8 +1,7 @@
 using System.Data;
 using System.Threading;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 using Rhino.Mocks;
 
 namespace MoMoney.Infrastructure.eventing

@@ -1,8 +1,8 @@
 using System;
 using Castle.Core.Interceptor;
 using Castle.DynamicProxy;
+using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.interceptors
 {

@@ -1,8 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Infrastructure.interceptors
 {

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel;
 using Castle.Core.Interceptor;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.interceptors
 {

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Threading;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.Logging.ConsoleLogging
 {

@@ -1,8 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Infrastructure.Logging
 {

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Castle.Core.Interceptor;
-using MoMoney.Utility.Extensions;
+using Gorilla.Commons.Utility.Extensions;
 
 namespace MoMoney.Infrastructure.proxies.Interceptors
 {

@@ -2,9 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.proxies.Interceptors
 {

@@ -1,9 +1,7 @@
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Infrastructure.Threading;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.proxies.Interceptors

@@ -1,7 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.proxies
 {

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Infrastructure.proxies.Interceptors;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 
 namespace MoMoney.Infrastructure.proxies
 {

@@ -4,9 +4,7 @@ using System.Linq;
 using System.Reflection;
 using Castle.Core.Interceptor;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.proxies
 {

@@ -1,11 +1,9 @@
 using System;
 using System.Data;
 using Castle.Core.Interceptor;
-using developwithpassion.bdd;
 using developwithpassion.bdd.contexts;
 using developwithpassion.bdd.mbunit;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
+using Gorilla.Commons.Testing;
 
 namespace MoMoney.Infrastructure.proxies
 {
@@ -24,12 +22,12 @@ namespace MoMoney.Infrastructure.proxies
 
         it should_return_a_proxy_to_the_target = () =>
                                                      {
-                                                         result.should_not_be_null();
+                                                         AssertionExtensions.should_not_be_null(result);
                                                          result.GetType().should_not_be_equal_to(target.GetType());
                                                      };
 
         it should_allow_the_interceptors_to_intercept_all_calls =
-            () => interceptor.recieved_call.should_be_true();
+            () => AssertionExtensions.should_be_true(interceptor.recieved_call);
 
         context c = () => { target = the_dependency<IDbConnection>(); };
 
@@ -48,7 +46,7 @@ namespace MoMoney.Infrastructure.proxies
     public class when_creating_a_proxy_of_a_target_but_a_call_has_not_been_made_to_the_proxy_yet :
         behaves_like_proxy_factory
     {
-        it should_not_create_an_instance_of_the_target = () => TestClass.was_created.should_be_false();
+        it should_not_create_an_instance_of_the_target = () => AssertionExtensions.should_be_false(TestClass.was_created);
 
         context c = TestClass.reset;
 
@@ -61,7 +59,7 @@ namespace MoMoney.Infrastructure.proxies
 
     public class when_creating_a_proxy_of_a_component_that_does_not_implement_an_interface : behaves_like_proxy_factory
     {
-        it should_return_a_proxy = () => result.should_not_be_null();
+        it should_return_a_proxy = () => AssertionExtensions.should_not_be_null(result);
 
         because b = () => { result = sut.create_proxy_for(() => new ClassWithNoInterface()); };
 

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.registries
 {

@@ -1,10 +1,8 @@
 using System.Collections.Generic;
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.registries
 {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,4 +1,5 @@
 using System;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Utility.Core;
 

@@ -1,8 +1,6 @@
 using developwithpassion.bdd.contexts;
+using Gorilla.Commons.Testing;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
 using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading

@@ -1,7 +1,5 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 using MoMoney.Utility.Core;
 using Rhino.Mocks;
 

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,8 +1,6 @@
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Testing;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,6 +1,6 @@
 using System;
 using System.Linq.Expressions;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,9 +1,7 @@
 using System;
 using System.Timers;
 using developwithpassion.bdd.contexts;
-using MoMoney.Testing.MetaData;
-using MoMoney.Testing.spechelpers.contexts;
-using MoMoney.Testing.spechelpers.core;
+using Gorilla.Commons.Testing;
 using Rhino.Mocks;
 
 namespace MoMoney.Infrastructure.Threading

@@ -1,4 +1,4 @@
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,6 +1,6 @@
 using Castle.Core.Interceptor;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.interceptors;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,6 +1,6 @@
 using System.Threading;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
+using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Extensions;
-using MoMoney.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {

@@ -1,5 +1,5 @@
 using System.Threading;
-using MoMoney.Utility.Core;
+using Gorilla.Commons.Utility.Core;
 
 namespace MoMoney.Infrastructure.Threading
 {