killbill-memoizeit

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlementApi.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlementApi.java
index b2a4067..a27d833 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlementApi.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlementApi.java
@@ -266,8 +266,7 @@ public class TestDefaultEntitlementApi extends EntitlementTestSuiteWithEmbeddedD
 
         testListener.pushExpectedEvents(NextEvent.PAUSE, NextEvent.BLOCK);
         entitlementApi.pause(baseEntitlement.getBundleId(), new LocalDate(clock.getUTCNow()), callContext);
-        // TODO
-        //assertTrue(testListener.isCompleted(DELAY));
+        assertListenerStatus();
 
         // Verify blocking state
         final Entitlement baseEntitlement2 = entitlementApi.getEntitlementForId(baseEntitlement.getId(), callContext);
@@ -303,8 +302,7 @@ public class TestDefaultEntitlementApi extends EntitlementTestSuiteWithEmbeddedD
 
         testListener.pushExpectedEvents(NextEvent.RESUME, NextEvent.BLOCK);
         entitlementApi.resume(baseEntitlement.getBundleId(), new LocalDate(clock.getUTCNow()), callContext);
-        // TODO
-        //assertTrue(testListener.isCompleted(DELAY));
+        assertListenerStatus();
 
         // Verify call is idempotent
         entitlementApi.resume(baseEntitlement.getBundleId(), new LocalDate(clock.getUTCNow()), callContext);

diff --git a/util/src/test/java/com/ning/billing/api/TestApiListener.java b/util/src/test/java/com/ning/billing/api/TestApiListener.java
index fcaa5bf..1f8aacf 100644
--- a/util/src/test/java/com/ning/billing/api/TestApiListener.java
+++ b/util/src/test/java/com/ning/billing/api/TestApiListener.java
@@ -114,9 +114,11 @@ public class TestApiListener {
         switch (eventEffective.getTransitionType()) {
             case BLOCK_BUNDLE:
                 assertEqualsNicely(NextEvent.PAUSE);
+                notifyIfStackEmpty();
                 break;
             case UNBLOCK_BUNDLE:
                 assertEqualsNicely(NextEvent.RESUME);
+                notifyIfStackEmpty();
                 break;
         }
     }
@@ -130,7 +132,6 @@ public class TestApiListener {
 
     @Subscribe
     public void handleSubscriptionEvents(final EffectiveSubscriptionInternalEvent eventEffective) {
-
         log.info(String.format("Got subscription event %s", eventEffective.toString()));
         switch (eventEffective.getTransitionType()) {
             case TRANSFER: