killbill-memoizeit

diff --git a/catalog/pom.xml b/catalog/pom.xml
index bc40a07..e7dd393 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -39,6 +39,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>

diff --git a/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java b/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java
index 4af0136..30435bb 100644
--- a/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java
+++ b/catalog/src/test/java/com/ning/billing/catalog/MockCatalogModule.java
@@ -16,24 +16,20 @@
 
 package com.ning.billing.catalog;
 
+import org.mockito.Mockito;
+
 import com.google.inject.AbstractModule;
 import com.ning.billing.catalog.api.Catalog;
 import com.ning.billing.catalog.api.CatalogService;
-import com.ning.billing.mock.BrainDeadProxyFactory;
-import com.ning.billing.mock.BrainDeadProxyFactory.ZombieControl;
 
 public class MockCatalogModule extends AbstractModule {
-
     @Override
     protected void configure() {
-        CatalogService catalogService = BrainDeadProxyFactory.createBrainDeadProxyFor(CatalogService.class);
-        ((ZombieControl) catalogService).addResult("getCurrentCatalog", new MockCatalog());
-
-        catalogService = BrainDeadProxyFactory.createBrainDeadProxyFor(CatalogService.class);
-        final Catalog catalog = BrainDeadProxyFactory.createBrainDeadProxyFor(Catalog.class);
-
-        ((ZombieControl) catalogService).addResult("getFullCatalog", catalog);
+        final Catalog catalog = Mockito.mock(Catalog.class);
 
+        final CatalogService catalogService = Mockito.mock(CatalogService.class);
+        Mockito.when(catalogService.getCurrentCatalog()).thenReturn(new MockCatalog());
+        Mockito.when(catalogService.getFullCatalog()).thenReturn(catalog);
         bind(CatalogService.class).toInstance(catalogService);
     }
 }