killbill-memoizeit

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java b/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java
index ffaa2a1..eea4f02 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/util/SubscriptionChecker.java
@@ -76,9 +76,6 @@ public class SubscriptionChecker {
     }
 
     private List<SubscriptionBaseTransition> getSubscriptionEvents(final SubscriptionBase subscription) {
-        // STEPH_ENT
         return subscription.getAllTransitions();
     }
-
-
 }

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/svcs/DefaultInternalBlockingApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/svcs/DefaultInternalBlockingApi.java
index 7b17850..4c34c63 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/svcs/DefaultInternalBlockingApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/svcs/DefaultInternalBlockingApi.java
@@ -47,7 +47,7 @@ public class DefaultInternalBlockingApi implements BlockingInternalApi {
     public BlockingState getBlockingStateForService(final Blockable overdueable, final String serviceName, final InternalTenantContext context) {
         BlockingState state = dao.getBlockingStateForService(overdueable.getId(), serviceName, context);
         if (state == null) {
-            state = DefaultBlockingState.getClearState(getBlockingStateType(overdueable), clock);
+            state = DefaultBlockingState.getClearState(getBlockingStateType(overdueable), serviceName, clock);
         }
         return state;
     }

diff --git a/util/src/main/java/com/ning/billing/util/svcapi/junction/DefaultBlockingState.java b/util/src/main/java/com/ning/billing/util/svcapi/junction/DefaultBlockingState.java
index 54e7a02..fe7e83f 100644
--- a/util/src/main/java/com/ning/billing/util/svcapi/junction/DefaultBlockingState.java
+++ b/util/src/main/java/com/ning/billing/util/svcapi/junction/DefaultBlockingState.java
@@ -41,10 +41,9 @@ public class DefaultBlockingState extends EntityBase implements BlockingState {
     private final DateTime effectiveDate;
     private final BlockingStateType type;
 
-    public static BlockingState getClearState(final BlockingStateType type, final Clock clock) {
+    public static BlockingState getClearState(final BlockingStateType type, final String serviceName, final Clock clock) {
         if (clearState == null) {
-            // STEPH_ENT should we not always have a service name?
-            clearState = new DefaultBlockingState(null, type, CLEAR_STATE_NAME, null, false, false, false, clock.getUTCNow());
+            clearState = new DefaultBlockingState(null, type, CLEAR_STATE_NAME, serviceName, false, false, false, clock.getUTCNow());
         }
         return clearState;
     }

diff --git a/util/src/test/java/com/ning/billing/util/audit/api/TestDefaultAuditUserApi.java b/util/src/test/java/com/ning/billing/util/audit/api/TestDefaultAuditUserApi.java
index b4e18b0..0861ac9 100644
--- a/util/src/test/java/com/ning/billing/util/audit/api/TestDefaultAuditUserApi.java
+++ b/util/src/test/java/com/ning/billing/util/audit/api/TestDefaultAuditUserApi.java
@@ -27,6 +27,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.ning.billing.ObjectType;
+import com.ning.billing.entitlement.api.SubscriptionBundle;
 import com.ning.billing.subscription.api.timeline.BundleBaseTimeline;
 import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceItem;
@@ -35,6 +36,7 @@ import com.ning.billing.payment.api.Payment;
 import com.ning.billing.payment.api.Refund;
 import com.ning.billing.util.api.AuditLevel;
 import com.ning.billing.util.audit.AuditLog;
+import com.ning.billing.util.audit.AuditLogsForBundles;
 import com.ning.billing.util.audit.AuditLogsForInvoicePayments;
 import com.ning.billing.util.audit.AuditLogsForInvoices;
 import com.ning.billing.util.audit.AuditLogsForPayments;
@@ -59,7 +61,6 @@ public class TestDefaultAuditUserApi extends AuditLogsTestBase {
         auditLogs = ImmutableList.<AuditLog>of(createAuditLog(), createAuditLog(), createAuditLog(), createAuditLog());
         objectIds = ImmutableList.<UUID>of(UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID());
 
-//        super.setup();
 
         for (final TableName tableName : TableName.values()) {
             for (final UUID objectId : objectIds) {
@@ -72,17 +73,16 @@ public class TestDefaultAuditUserApi extends AuditLogsTestBase {
 
     @Test(groups = "fast")
     public void testForBundles() throws Exception {
-        final List<BundleBaseTimeline> bundles = new ArrayList<BundleBaseTimeline>();
+        final List<SubscriptionBundle> bundles = new ArrayList<SubscriptionBundle>();
         for (final UUID objectId : objectIds) {
-            final BundleBaseTimeline entity = Mockito.mock(BundleBaseTimeline.class);
+            final SubscriptionBundle entity = Mockito.mock(SubscriptionBundle.class);
             Mockito.when(entity.getId()).thenReturn(objectId);
             bundles.add(entity);
         }
 
         for (final AuditLevel level : AuditLevel.values()) {
-            // STEPH_ENT
-            //final AuditLogsForBundles auditLogsForBundles = auditUserApi.getAuditLogsForBundles(bundles, level, callContext);
-            //verifyAuditLogs(auditLogsForBundles.getBundlesAuditLogs(), level);
+            final AuditLogsForBundles auditLogsForBundles = auditUserApi.getAuditLogsForBundles(bundles, level, callContext);
+            verifyAuditLogs(auditLogsForBundles.getBundlesAuditLogs(), level);
         }
     }