killbill-memoizeit

diff --git a/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java b/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java
index 44adf5b..f3b2856 100644
--- a/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java
+++ b/junction/src/test/java/com/ning/billing/junction/blocking/TestBlockingChecker.java
@@ -25,6 +25,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.ning.billing.account.api.Account;
+import com.ning.billing.entitlement.api.user.EntitlementUserApi;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
 import com.ning.billing.entitlement.api.user.Subscription;
 import com.ning.billing.entitlement.api.user.SubscriptionBundle;
@@ -37,6 +38,7 @@ import com.ning.billing.junction.block.DefaultBlockingChecker;
 import com.ning.billing.junction.dao.BlockingStateDao;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
+import com.ning.billing.util.callcontext.TenantContext;
 import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.svcapi.entitlement.EntitlementInternalApi;
 import com.ning.billing.util.svcapi.junction.DefaultBlockingState;
@@ -117,10 +119,16 @@ public class TestBlockingChecker extends JunctionTestSuite {
 
                 bind(BlockingStateDao.class).toInstance(dao);
 
+
+                // Since we re-enabled EntitlementUserApi for Checher we need a binding, that should go eventually
+                final EntitlementUserApi entitlementUserApi = Mockito.mock(EntitlementUserApi.class);
+                bind(EntitlementUserApi.class).toInstance(entitlementUserApi);
+
                 final EntitlementInternalApi entitlementInternalApi = Mockito.mock(EntitlementInternalApi.class);
                 bind(EntitlementInternalApi.class).toInstance(entitlementInternalApi);
 
                 try {
+                    Mockito.when(entitlementUserApi.getBundleFromId(Mockito.<UUID>any(), Mockito.<TenantContext>any())).thenReturn(bundle);
                     Mockito.when(entitlementInternalApi.getBundleFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(bundle);
                 } catch (EntitlementUserApiException e) {
                     Assert.fail(e.toString());