killbill-aplcache

diff --git a/api/src/main/java/com/ning/billing/glue/EntitlementModule.java b/api/src/main/java/com/ning/billing/glue/EntitlementModule.java
index 5e686af..456fb17 100644
--- a/api/src/main/java/com/ning/billing/glue/EntitlementModule.java
+++ b/api/src/main/java/com/ning/billing/glue/EntitlementModule.java
@@ -23,5 +23,7 @@ public interface EntitlementModule {
 
     public void installEntitlementApi();
 
+    public void installSubscriptionApi();
+
     public void installBlockingChecker();
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscriptionApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscriptionApi.java
new file mode 100644
index 0000000..bb4171c
--- /dev/null
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultSubscriptionApi.java
@@ -0,0 +1,29 @@
+package com.ning.billing.entitlement.api;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.ning.billing.util.callcontext.TenantContext;
+
+public class DefaultSubscriptionApi implements SubscriptionApi  {
+
+    @Override
+    public Subscription getSubscriptionForEntitlementId(final UUID entitlementId, final TenantContext context) throws SubscriptionApiException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public SubscriptionBundle getSubscriptionBundle(final UUID bundleId, final TenantContext context) throws SubscriptionApiException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public SubscriptionBundle getSubscriptionBundleForAccountIdAndExternalKey(final UUID accountId, final String externalKey, final TenantContext context) throws SubscriptionApiException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public List<SubscriptionBundle> getSubscriptionBundlesForAccountId(final UUID accountId, final TenantContext context) throws SubscriptionApiException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+}

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java b/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
index 6de4ac7..691b2ba 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/glue/DefaultEntitlementModule.java
@@ -19,7 +19,9 @@ package com.ning.billing.entitlement.glue;
 import org.skife.config.ConfigSource;
 
 import com.ning.billing.entitlement.api.DefaultEntitlementApi;
+import com.ning.billing.entitlement.api.DefaultSubscriptionApi;
 import com.ning.billing.entitlement.api.EntitlementApi;
+import com.ning.billing.entitlement.api.SubscriptionApi;
 import com.ning.billing.entitlement.api.svcs.DefaultInternalBlockingApi;
 import com.ning.billing.entitlement.block.BlockingChecker;
 import com.ning.billing.entitlement.block.DefaultBlockingChecker;
@@ -60,6 +62,11 @@ public class DefaultEntitlementModule extends AbstractModule implements Entitlem
         bind(EntitlementApi.class).to(DefaultEntitlementApi.class).asEagerSingleton();
     }
 
+    @Override
+    public void installSubscriptionApi() {
+        bind(SubscriptionApi.class).to(DefaultSubscriptionApi.class).asEagerSingleton();
+    }
+
     public void installBlockingChecker() {
         bind(BlockingChecker.class).to(DefaultBlockingChecker.class).asEagerSingleton();
     }

diff --git a/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculator.java b/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculator.java
index 3eb3e23..8a0e922 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculator.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculator.java
@@ -82,8 +82,8 @@ public class BillingStateCalculator {
         return new BillingState(account.getId(), numberOfUnpaidInvoices, unpaidInvoiceBalance, dateOfEarliestUnpaidInvoice, account.getTimeZone(), idOfEarliestUnpaidInvoice, responseForLastFailedPayment, tags);
     }
 
-
-    private Invoice earliest(final SortedSet<Invoice> unpaidInvoices) {
+    // Package scope for testing
+    Invoice earliest(final SortedSet<Invoice> unpaidInvoices) {
         try {
             return unpaidInvoices.first();
         } catch (NoSuchElementException e) {
@@ -91,7 +91,7 @@ public class BillingStateCalculator {
         }
     }
 
-    private BigDecimal sumBalance(final SortedSet<Invoice> unpaidInvoices) {
+    BigDecimal sumBalance(final SortedSet<Invoice> unpaidInvoices) {
         BigDecimal sum = BigDecimal.ZERO;
         for (final Invoice unpaidInvoice : unpaidInvoices) {
             sum = sum.add(unpaidInvoice.getBalance());
@@ -99,7 +99,7 @@ public class BillingStateCalculator {
         return sum;
     }
 
-    private SortedSet<Invoice> unpaidInvoicesForAccount(final UUID accountId, final DateTimeZone accountTimeZone, final InternalTenantContext context) {
+    SortedSet<Invoice> unpaidInvoicesForAccount(final UUID accountId, final DateTimeZone accountTimeZone, final InternalTenantContext context) {
         final Collection<Invoice> invoices = invoiceApi.getUnpaidInvoicesByAccountId(accountId, clock.getToday(accountTimeZone), context);
         final SortedSet<Invoice> sortedInvoices = new TreeSet<Invoice>(new InvoiceDateComparator());
         sortedInvoices.addAll(invoices);

diff --git a/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java b/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java
index 2c1f9b8..407ce04 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/listener/OverdueDispatcher.java
@@ -34,13 +34,10 @@ public class OverdueDispatcher {
 
     Logger log = LoggerFactory.getLogger(OverdueDispatcher.class);
 
-    private final SubscriptionBaseInternalApi subscriptionApi;
     private final OverdueWrapperFactory factory;
 
     @Inject
-    public OverdueDispatcher(final SubscriptionBaseInternalApi subscriptionApi,
-                             final OverdueWrapperFactory factory) {
-        this.subscriptionApi = subscriptionApi;
+    public OverdueDispatcher(final OverdueWrapperFactory factory) {
         this.factory = factory;
     }
 
@@ -49,10 +46,7 @@ public class OverdueDispatcher {
     }
 
     public void clearOverdueForAccount(final UUID accountId, final InternalCallContext context) {
-        final List<SubscriptionBaseBundle> bundles = subscriptionApi.getBundlesForAccount(accountId, context);
-        for (final SubscriptionBaseBundle bundle : bundles) {
-            clearOverdue(bundle.getId(), context);
-        }
+        clearOverdue(accountId, context);
     }
 
     public void processOverdue(final UUID blockableId, final InternalCallContext context) {

diff --git a/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java b/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java
index fb97700..ce9b2f0 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java
@@ -26,6 +26,7 @@ import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.ning.billing.account.api.Account;
 import com.ning.billing.subscription.api.user.SubscriptionBaseBundle;
 import com.ning.billing.overdue.OverdueState;
 import com.ning.billing.overdue.OverdueTestSuiteWithEmbeddedDB;
@@ -45,28 +46,25 @@ public class TestOverdueStateApplicator extends OverdueTestSuiteWithEmbeddedDB {
         final OverdueConfig config = XMLLoader.getObjectFromStreamNoValidation(is, OverdueConfig.class);
         overdueWrapperFactory.setOverdueConfig(config);
 
-        final SubscriptionBaseBundle bundle = Mockito.mock(SubscriptionBaseBundle.class);
-        Mockito.when(bundle.getId()).thenReturn(UUID.randomUUID());
+        final Account account = Mockito.mock(Account.class);
+        Mockito.when(account.getId()).thenReturn(UUID.randomUUID());
 
-        /*
-        // STEPH_ENT
-        OverdueState<SubscriptionBaseBundle> state;
+        OverdueState state;
 
         state = config.getBundleStateSet().findState("OD1");
-        applicator.apply(null, null, bundle, DefaultBlockingState.CLEAR_STATE_NAME, state, internalCallContext);
+        applicator.apply(null, null, account, DefaultBlockingState.CLEAR_STATE_NAME, state, internalCallContext);
         testOverdueHelper.checkStateApplied(state);
         checkBussEvent("OD1");
 
         state = config.getBundleStateSet().findState("OD2");
-        applicator.apply(null, null, bundle, DefaultBlockingState.CLEAR_STATE_NAME, state, internalCallContext);
+        applicator.apply(null, null, account, DefaultBlockingState.CLEAR_STATE_NAME, state, internalCallContext);
         testOverdueHelper.checkStateApplied(state);
         checkBussEvent("OD2");
 
         state = config.getBundleStateSet().findState("OD3");
-        applicator.apply(null, null, bundle, DefaultBlockingState.CLEAR_STATE_NAME, state, internalCallContext);
+        applicator.apply(null, null, account, DefaultBlockingState.CLEAR_STATE_NAME, state, internalCallContext);
         testOverdueHelper.checkStateApplied(state);
         checkBussEvent("OD3");
-        */
     }
 
     private void checkBussEvent(final String state) throws Exception {

diff --git a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java
index edd211a..35de341 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java
@@ -31,7 +31,6 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.ning.billing.account.api.Account;
-import com.ning.billing.subscription.api.user.SubscriptionBaseBundle;
 import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceItem;
 import com.ning.billing.overdue.OverdueTestSuiteNoDB;
@@ -51,8 +50,7 @@ public class TestBillingStateCalculator extends OverdueTestSuiteNoDB {
         Mockito.when(accountApi.getAccountById(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(account);
     }
 
-    /*
-    public BillingStateCalculator<SubscriptionBaseBundle> createBSCalc() {
+    public BillingStateCalculator createBSCalc() {
         now = new LocalDate();
         final Collection<Invoice> invoices = new ArrayList<Invoice>();
         invoices.add(createInvoice(now, BigDecimal.ZERO, null));
@@ -61,15 +59,15 @@ public class TestBillingStateCalculator extends OverdueTestSuiteNoDB {
 
         Mockito.when(invoiceApi.getUnpaidInvoicesByAccountId(Mockito.<UUID>any(), Mockito.<LocalDate>any(), Mockito.<InternalTenantContext>any())).thenReturn(invoices);
 
-        return new BillingStateCalculator<SubscriptionBaseBundle>(invoiceApi, clock) {
+        return new BillingStateCalculator(invoiceApi, clock) {
             @Override
-            public BillingState<SubscriptionBaseBundle> calculateBillingState(final SubscriptionBaseBundle overdueable,
-                                                                          final InternalTenantContext context) {
+            public BillingState calculateBillingState(final Account overdueable,
+                                                      final InternalTenantContext context) {
                 return null;
             }
         };
     }
-*/
+
     public Invoice createInvoice(final LocalDate date, final BigDecimal balance, final List<InvoiceItem> invoiceItems) {
         final Invoice invoice = Mockito.mock(Invoice.class);
         Mockito.when(invoice.getBalance()).thenReturn(balance);
@@ -80,12 +78,9 @@ public class TestBillingStateCalculator extends OverdueTestSuiteNoDB {
         return invoice;
     }
 
-    /*
-
-    STEPH_ENT
     @Test(groups = "fast")
     public void testUnpaidInvoices() {
-        final BillingStateCalculator<SubscriptionBaseBundle> calc = createBSCalc();
+        final BillingStateCalculator calc = createBSCalc();
         final SortedSet<Invoice> invoices = calc.unpaidInvoicesForAccount(new UUID(0L, 0L), DateTimeZone.UTC, internalCallContext);
 
         Assert.assertEquals(invoices.size(), 3);
@@ -95,16 +90,15 @@ public class TestBillingStateCalculator extends OverdueTestSuiteNoDB {
 
     @Test(groups = "fast")
     public void testSum() {
-        final BillingStateCalculator<SubscriptionBaseBundle> calc = createBSCalc();
+        final BillingStateCalculator calc = createBSCalc();
         final SortedSet<Invoice> invoices = calc.unpaidInvoicesForAccount(new UUID(0L, 0L), DateTimeZone.UTC, internalCallContext);
         Assert.assertEquals(new BigDecimal("110.0").compareTo(calc.sumBalance(invoices)), 0);
     }
 
     @Test(groups = "fast")
     public void testEarliest() {
-        final BillingStateCalculator<SubscriptionBaseBundle> calc = createBSCalc();
+        final BillingStateCalculator calc = createBSCalc();
         final SortedSet<Invoice> invoices = calc.unpaidInvoicesForAccount(new UUID(0L, 0L), DateTimeZone.UTC, internalCallContext);
         Assert.assertEquals(calc.earliest(invoices).getInvoiceDate(), now);
     }
-*/
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/glue/TestOverdueModule.java b/overdue/src/test/java/com/ning/billing/overdue/glue/TestOverdueModule.java
index b2f505d..315bcbc 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/glue/TestOverdueModule.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/glue/TestOverdueModule.java
@@ -19,6 +19,7 @@ package com.ning.billing.overdue.glue;
 import org.skife.config.ConfigSource;
 
 import com.ning.billing.mock.glue.MockAccountModule;
+import com.ning.billing.mock.glue.MockEntitlementModule;
 import com.ning.billing.mock.glue.MockSubscriptionModule;
 import com.ning.billing.mock.glue.MockInvoiceModule;
 import com.ning.billing.mock.glue.MockTagModule;
@@ -47,7 +48,7 @@ public class TestOverdueModule extends DefaultOverdueModule {
         install(new CustomFieldModule());
         install(new EmailModule(configSource));
         install(new MockAccountModule());
-        install(new MockSubscriptionModule());
+        install(new MockEntitlementModule());
         install(new MockInvoiceModule());
         install(new MockTagModule());
         install(new TemplateModule());

diff --git a/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java b/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
index e60ee9c..712f0a0 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
@@ -78,9 +78,6 @@ public class TestOverdueCheckNotifier extends OverdueTestSuiteWithEmbeddedDB {
         final Account account = Mockito.mock(Account.class);
         Mockito.when(accountApi.getAccountById(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(account);
 
-        final SubscriptionBase subscription = Mockito.mock(SubscriptionBase.class);
-        Mockito.when(subscriptionApi.getSubscriptionFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(subscription);
-
         mockListener = new OverdueListenerMock(internalCallContextFactory);
         notifierForMock = new DefaultOverdueCheckNotifier(notificationQueueService, overdueProperties, mockListener);
 

diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
index f21ebc5..abeb54b 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteNoDB.java
@@ -56,8 +56,6 @@ public abstract class OverdueTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
     @Inject
     protected DefaultOverdueService service;
     @Inject
-    protected SubscriptionBaseInternalApi subscriptionApi;
-    @Inject
     protected PersistentBus bus;
     @Inject
     protected InternalCallContextFactory internalCallContextFactory;

diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
index ff51e29..4068188 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
@@ -58,8 +58,6 @@ public abstract class OverdueTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
     @Inject
     protected DefaultOverdueService service;
     @Inject
-    protected SubscriptionBaseInternalApi subscriptionApi;
-    @Inject
     protected CacheControllerDispatcher cacheControllerDispatcher;
     @Inject
     protected PersistentBus bus;

diff --git a/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java b/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java
index 62658c9..9cfdc46 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/TestOverdueHelper.java
@@ -49,7 +49,7 @@ public class TestOverdueHelper {
 
     private final String configXml =
             "<overdueConfig>" +
-            "   <bundleOverdueStates>" +
+            "   <accountOverdueStates>" +
             "       <state name=\"OD3\">" +
             "           <condition>" +
             "               <timeSinceEarliestUnpaidInvoiceEqualsOrExceeds>" +
@@ -89,19 +89,18 @@ public class TestOverdueHelper {
             "               <unit>DAYS</unit><number>100</number>" + // this number is intentionally too high
             "           </autoReevaluationInterval>" +
             "       </state>" +
-            "   </bundleOverdueStates>" +
+            "   </accountOverdueStates>" +
             "</overdueConfig>";
 
     private final AccountInternalApi accountInternalApi;
-    private final SubscriptionBaseInternalApi subscriptionInternalApi;
     private final InvoiceInternalApi invoiceInternalApi;
     private final BlockingInternalApi blockingInternalApi;
 
     @Inject
-    public TestOverdueHelper(final AccountInternalApi accountInternalApi, final SubscriptionBaseInternalApi subscriptionInternalApi,
-                             final InvoiceInternalApi invoiceInternalApi, final BlockingInternalApi blockingInternalApi) {
+    public TestOverdueHelper(final AccountInternalApi accountInternalApi,
+                             final InvoiceInternalApi invoiceInternalApi,
+                             final BlockingInternalApi blockingInternalApi) {
         this.accountInternalApi = accountInternalApi;
-        this.subscriptionInternalApi = subscriptionInternalApi;
         this.invoiceInternalApi = invoiceInternalApi;
         this.blockingInternalApi = blockingInternalApi;
     }
@@ -118,10 +117,7 @@ public class TestOverdueHelper {
         Assert.assertEquals(result.isBlockBilling(), state.disableEntitlementAndChangesBlocked());
     }
 
-    public SubscriptionBaseBundle createBundle(final LocalDate dateOfLastUnPaidInvoice) throws SubscriptionBaseApiException, AccountApiException {
-        final SubscriptionBaseBundle bundle = Mockito.mock(SubscriptionBaseBundle.class);
-        final UUID bundleId = UUID.randomUUID();
-        Mockito.when(bundle.getId()).thenReturn(bundleId);
+    public Account createAccount(final LocalDate dateOfLastUnPaidInvoice) throws SubscriptionBaseApiException, AccountApiException {
 
         final UUID accountId = UUID.randomUUID();
         final Account account = Mockito.mock(Account.class);
@@ -129,15 +125,12 @@ public class TestOverdueHelper {
         Mockito.when(account.getTimeZone()).thenReturn(DateTimeZone.UTC);
         Mockito.when(accountInternalApi.getAccountById(Mockito.eq(account.getId()), Mockito.<InternalTenantContext>any())).thenReturn(account);
 
-        Mockito.when(bundle.getAccountId()).thenReturn(accountId);
-
         final Invoice invoice = Mockito.mock(Invoice.class);
         Mockito.when(invoice.getInvoiceDate()).thenReturn(dateOfLastUnPaidInvoice);
         Mockito.when(invoice.getBalance()).thenReturn(BigDecimal.TEN);
         Mockito.when(invoice.getId()).thenReturn(UUID.randomUUID());
 
         final InvoiceItem item = Mockito.mock(InvoiceItem.class);
-        Mockito.when(item.getBundleId()).thenReturn(bundleId);
         final List<InvoiceItem> items = new ArrayList<InvoiceItem>();
         items.add(item);
 
@@ -147,13 +140,7 @@ public class TestOverdueHelper {
         invoices.add(invoice);
         Mockito.when(invoiceInternalApi.getUnpaidInvoicesByAccountId(Mockito.<UUID>any(), Mockito.<LocalDate>any(), Mockito.<InternalTenantContext>any())).thenReturn(invoices);
 
-        final SubscriptionBase base = Mockito.mock(SubscriptionBase.class);
-        Mockito.when(base.getCurrentPlan()).thenReturn(MockPlan.createBicycleNoTrialEvergreen1USD());
-        Mockito.when(base.getCurrentPriceList()).thenReturn(new MockPriceList());
-        Mockito.when(base.getCurrentPhase()).thenReturn(MockPlan.createBicycleNoTrialEvergreen1USD().getFinalPhase());
-        Mockito.when(subscriptionInternalApi.getBaseSubscription(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(base);
-
-        return bundle;
+        return account;
     }
 
     public String getConfigXml() {

diff --git a/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java b/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java
index 56539c2..e6942e9 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.ning.billing.account.api.Account;
 import com.ning.billing.overdue.OverdueState;
 import com.ning.billing.overdue.OverdueTestSuiteWithEmbeddedDB;
 import com.ning.billing.overdue.config.OverdueConfig;
@@ -37,25 +38,25 @@ public class TestOverdueWrapper extends OverdueTestSuiteWithEmbeddedDB {
         final OverdueConfig config = XMLLoader.getObjectFromStreamNoValidation(is, OverdueConfig.class);
         overdueWrapperFactory.setOverdueConfig(config);
 
-        SubscriptionBaseBundle bundle;
+        Account account;
         OverdueWrapper wrapper;
         OverdueState state;
 
         state = config.getBundleStateSet().findState("OD1");
-        bundle = testOverdueHelper.createBundle(clock.getUTCToday().minusDays(31));
-        wrapper = null; // STEPH_ENT account overdueWrapperFactory.createOverdueWrapperFor(bundle);
+        account = testOverdueHelper.createAccount(clock.getUTCToday().minusDays(31));
+        wrapper = overdueWrapperFactory.createOverdueWrapperFor(account);
         wrapper.refresh(internalCallContext);
         testOverdueHelper.checkStateApplied(state);
 
         state = config.getBundleStateSet().findState("OD2");
-        bundle = testOverdueHelper.createBundle(clock.getUTCToday().minusDays(41));
-        wrapper = null; // STEPH_ENToverdueWrapperFactory.createOverdueWrapperFor(bundle);
+        account = testOverdueHelper.createAccount(clock.getUTCToday().minusDays(41));
+        wrapper = overdueWrapperFactory.createOverdueWrapperFor(account);
         wrapper.refresh(internalCallContext);
         testOverdueHelper.checkStateApplied(state);
 
         state = config.getBundleStateSet().findState("OD3");
-        bundle = testOverdueHelper.createBundle(clock.getUTCToday().minusDays(51));
-        wrapper = null; // STEPH_ENToverdueWrapperFactory.createOverdueWrapperFor(bundle);
+        account = testOverdueHelper.createAccount(clock.getUTCToday().minusDays(51));
+        wrapper = overdueWrapperFactory.createOverdueWrapperFor(account);
         wrapper.refresh(internalCallContext);
         testOverdueHelper.checkStateApplied(state);
     }
@@ -64,15 +65,15 @@ public class TestOverdueWrapper extends OverdueTestSuiteWithEmbeddedDB {
     public void testWrapperNoConfig() throws Exception {
         overdueWrapperFactory.setOverdueConfig(null);
 
-        final SubscriptionBaseBundle bundle;
+        final Account account;
         final OverdueWrapper wrapper;
         final OverdueState state;
 
         final InputStream is = new ByteArrayInputStream(testOverdueHelper.getConfigXml().getBytes());
         final OverdueConfig config = XMLLoader.getObjectFromStreamNoValidation(is, OverdueConfig.class);
         state = config.getBundleStateSet().findState(DefaultBlockingState.CLEAR_STATE_NAME);
-        bundle = testOverdueHelper.createBundle(clock.getUTCToday().minusDays(31));
-        wrapper = null; // STEPH_ENT overdueWrapperFactory.createOverdueWrapperFor(bundle);
+        account = testOverdueHelper.createAccount(clock.getUTCToday().minusDays(31));
+        wrapper = overdueWrapperFactory.createOverdueWrapperFor(account);
         final OverdueState result = wrapper.refresh(internalCallContext);
 
         Assert.assertEquals(result.getName(), state.getName());

diff --git a/util/src/main/java/com/ning/billing/util/audit/api/DefaultAuditUserApi.java b/util/src/main/java/com/ning/billing/util/audit/api/DefaultAuditUserApi.java
index 5925428..c60cc0f 100644
--- a/util/src/main/java/com/ning/billing/util/audit/api/DefaultAuditUserApi.java
+++ b/util/src/main/java/com/ning/billing/util/audit/api/DefaultAuditUserApi.java
@@ -67,7 +67,7 @@ public class DefaultAuditUserApi implements AuditUserApi {
     private final InternalCallContextFactory internalCallContextFactory;
 
     @Inject
-    public DefaultAuditUserApi(final AuditDao auditDao, final SubscriptionBaseTimelineApi timelineApi, final InternalCallContextFactory internalCallContextFactory) {
+    public DefaultAuditUserApi(final AuditDao auditDao, final InternalCallContextFactory internalCallContextFactory) {
         this.auditDao = auditDao;
         this.internalCallContextFactory = internalCallContextFactory;
     }

diff --git a/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java b/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java
index 9726c41..b410bd7 100644
--- a/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java
+++ b/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java
@@ -35,7 +35,9 @@ public class MockAccountModule extends AbstractModule implements AccountModule {
 
     @Override
     public void installAccountUserApi() {
+        // STEPH_ENT RealImplementation for accountUserApi
         bind(AccountUserApi.class).annotatedWith(RealImplementation.class).toInstance(Mockito.mock(AccountUserApi.class));
+        bind(AccountUserApi.class).toInstance(Mockito.mock(AccountUserApi.class));
     }
 
     @Override

diff --git a/util/src/test/java/com/ning/billing/mock/glue/MockEntitlementModule.java b/util/src/test/java/com/ning/billing/mock/glue/MockEntitlementModule.java
index b2bcba3..0d8115f 100644
--- a/util/src/test/java/com/ning/billing/mock/glue/MockEntitlementModule.java
+++ b/util/src/test/java/com/ning/billing/mock/glue/MockEntitlementModule.java
@@ -19,6 +19,7 @@ package com.ning.billing.mock.glue;
 import org.mockito.Mockito;
 
 import com.ning.billing.entitlement.api.EntitlementApi;
+import com.ning.billing.entitlement.api.SubscriptionApi;
 import com.ning.billing.glue.EntitlementModule;
 import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
 
@@ -28,6 +29,7 @@ public class MockEntitlementModule extends AbstractModule implements Entitlement
 
     private final BlockingInternalApi blockingApi = Mockito.mock(BlockingInternalApi.class);
     private final EntitlementApi entitlementApi = Mockito.mock(EntitlementApi.class);
+    private final SubscriptionApi subscriptionApi = Mockito.mock(SubscriptionApi.class);
 
     @Override
     protected void configure() {
@@ -42,7 +44,7 @@ public class MockEntitlementModule extends AbstractModule implements Entitlement
 
     @Override
     public void installBlockingApi() {
-        bind(BlockingInternalApi.class).toInstance(blockingApi);
+        //bind(BlockingInternalApi.class).toInstance(blockingApi);
     }
 
     @Override
@@ -51,6 +53,11 @@ public class MockEntitlementModule extends AbstractModule implements Entitlement
     }
 
     @Override
+    public void installSubscriptionApi() {
+        bind(SubscriptionApi.class).toInstance(subscriptionApi);
+    }
+
+    @Override
     public void installBlockingChecker() {
     }