diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java b/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
index bb5b4ce..1a9b328 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
@@ -372,6 +372,21 @@ public class MockEntitlementDaoMemory implements EntitlementDao, MockEntitlement
@Override
public void undoMigration(UUID accountId) {
- }
+ synchronized(events) {
+
+ List<SubscriptionBundle> allBundles = getSubscriptionBundleForAccount(accountId);
+ for (SubscriptionBundle bundle : allBundles) {
+ List<Subscription> allSubscriptions = getSubscriptions(bundle.getId());
+ for (Subscription subscription : allSubscriptions) {
+ List<EntitlementEvent> allEvents = getEventsForSubscription(subscription.getId());
+ for (EntitlementEvent event : allEvents) {
+ events.remove(event);
+ }
+ subscriptions.remove(subscription);
+ }
+ bundles.remove(bundle);
+ }
+ }
+ }
}