killbill-memoizeit

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscription.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscription.java
index 6433e5e..02427e6 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscription.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessSubscription.java
@@ -111,15 +111,15 @@ public class BusinessSubscription {
                     mrr = null;
                 }
             } else {
-                price = BigDecimal.ZERO;
-                mrr = BigDecimal.ZERO;
+                price = null;
+                mrr = null;
             }
         } else {
             slug = null;
             phase = null;
             billingPeriod = null;
-            price = BigDecimal.ZERO;
-            mrr = BigDecimal.ZERO;
+            price = null;
+            mrr = null;
         }
 
         if (currency != null) {

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java
index a3583f0..db0b552 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java
@@ -102,7 +102,6 @@ public abstract class AnalyticsTestSuiteNoDB {
     protected OSGIKillbillDataSource killbillDataSource;
 
     protected void verifyBusinessEntityBase(final BusinessEntityBase businessEntityBase) {
-        Assert.assertEquals(businessEntityBase.getCreatedDate(), auditLog.getCreatedDate());
         Assert.assertEquals(businessEntityBase.getCreatedBy(), auditLog.getUserName());
         Assert.assertEquals(businessEntityBase.getCreatedReasonCode(), auditLog.getReasonCode());
         Assert.assertEquals(businessEntityBase.getCreatedComments(), auditLog.getComment());
@@ -114,7 +113,6 @@ public abstract class AnalyticsTestSuiteNoDB {
     protected void verifyBusinessModelDaoBase(final BusinessModelDaoBase businessModelDaoBase,
                                               final Long accountRecordId,
                                               final Long tenantRecordId) {
-        Assert.assertEquals(businessModelDaoBase.getCreatedDate(), account.getCreatedDate());
         Assert.assertEquals(businessModelDaoBase.getCreatedBy(), auditLog.getUserName());
         Assert.assertEquals(businessModelDaoBase.getCreatedReasonCode(), auditLog.getReasonCode());
         Assert.assertEquals(businessModelDaoBase.getCreatedComments(), auditLog.getComment());
@@ -148,12 +146,14 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(account.getPhone()).thenReturn(UUID.randomUUID().toString().substring(0, 25));
         Mockito.when(account.isMigrated()).thenReturn(true);
         Mockito.when(account.isNotifiedForInvoices()).thenReturn(true);
+        Mockito.when(account.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 47, DateTimeZone.UTC));
         final UUID accountId = account.getId();
 
         bundle = Mockito.mock(SubscriptionBundle.class);
         Mockito.when(bundle.getId()).thenReturn(UUID.randomUUID());
         Mockito.when(bundle.getAccountId()).thenReturn(accountId);
         Mockito.when(bundle.getExternalKey()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(bundle.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 48, DateTimeZone.UTC));
         final UUID bundleId = bundle.getId();
 
         final Product product = Mockito.mock(Product.class);
@@ -191,6 +191,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(subscriptionTransition.getRequestedTransitionTime()).thenReturn(new DateTime(2010, 1, 2, 3, 4, 5, DateTimeZone.UTC));
         Mockito.when(subscriptionTransition.getEffectiveTransitionTime()).thenReturn(new DateTime(2011, 2, 3, 4, 5, 6, DateTimeZone.UTC));
         Mockito.when(subscriptionTransition.getTransitionType()).thenReturn(SubscriptionTransitionType.CREATE);
+        Mockito.when(subscriptionTransition.getNextEventCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 49, DateTimeZone.UTC));
         final UUID subscriptionId = subscriptionTransition.getSubscriptionId();
 
         blockingState = Mockito.mock(BlockingState.class);
@@ -204,6 +205,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(blockingState.isBlockEntitlement()).thenReturn(true);
         Mockito.when(blockingState.getDescription()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(blockingState.getService()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(blockingState.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 00, DateTimeZone.UTC));
 
         invoiceItem = Mockito.mock(InvoiceItem.class);
         Mockito.when(invoiceItem.getId()).thenReturn(UUID.randomUUID());
@@ -221,6 +223,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(invoiceItem.getPhaseName()).thenReturn(phaseName);
         Mockito.when(invoiceItem.getRate()).thenReturn(new BigDecimal("1203"));
         Mockito.when(invoiceItem.getLinkedItemId()).thenReturn(UUID.randomUUID());
+        Mockito.when(invoiceItem.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 51, DateTimeZone.UTC));
 
         final UUID invoiceId = UUID.randomUUID();
 
@@ -234,6 +237,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(invoicePayment.getCurrency()).thenReturn(Currency.MXN);
         Mockito.when(invoicePayment.getLinkedInvoicePaymentId()).thenReturn(UUID.randomUUID());
         Mockito.when(invoicePayment.getPaymentCookieId()).thenReturn(UUID.randomUUID());
+        Mockito.when(invoicePayment.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 53, DateTimeZone.UTC));
 
         invoice = Mockito.mock(Invoice.class);
         Mockito.when(invoice.getId()).thenReturn(invoiceId);
@@ -255,6 +259,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(invoice.getRefundAdjAmount()).thenReturn(new BigDecimal("384"));
         Mockito.when(invoice.getBalance()).thenReturn(new BigDecimal("18376"));
         Mockito.when(invoice.isMigrationInvoice()).thenReturn(false);
+        Mockito.when(invoice.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 53, DateTimeZone.UTC));
 
         paymentAttempt = Mockito.mock(PaymentAttempt.class);
         Mockito.when(paymentAttempt.getId()).thenReturn(UUID.randomUUID());
@@ -262,6 +267,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(paymentAttempt.getGatewayErrorCode()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(paymentAttempt.getGatewayErrorMsg()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(paymentAttempt.getPaymentStatus()).thenReturn(PaymentStatus.SUCCESS);
+        Mockito.when(paymentAttempt.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 54, DateTimeZone.UTC));
 
         final PaymentMethodPlugin paymentMethodPlugin = Mockito.mock(PaymentMethodPlugin.class);
         Mockito.when(paymentMethodPlugin.getExternalPaymentMethodId()).thenReturn(UUID.randomUUID().toString());
@@ -273,6 +279,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(paymentMethod.isActive()).thenReturn(true);
         Mockito.when(paymentMethod.getPluginName()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(paymentMethod.getPluginDetail()).thenReturn(paymentMethodPlugin);
+        Mockito.when(paymentMethod.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 55, DateTimeZone.UTC));
         final UUID paymentMethodId = paymentMethod.getId();
 
         payment = Mockito.mock(Payment.class);
@@ -289,6 +296,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(payment.getAttempts()).thenReturn(ImmutableList.<PaymentAttempt>of(paymentAttempt));
         Mockito.when(payment.getExtFirstPaymentIdRef()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(payment.getExtSecondPaymentIdRef()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(payment.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 56, DateTimeZone.UTC));
 
         customField = Mockito.mock(CustomField.class);
         Mockito.when(customField.getId()).thenReturn(UUID.randomUUID());
@@ -296,11 +304,13 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(customField.getObjectType()).thenReturn(ObjectType.TENANT);
         Mockito.when(customField.getFieldName()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(customField.getFieldValue()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(customField.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 57, DateTimeZone.UTC));
 
         tag = Mockito.mock(Tag.class);
         Mockito.when(tag.getObjectId()).thenReturn(UUID.randomUUID());
         Mockito.when(tag.getObjectType()).thenReturn(ObjectType.ACCOUNT);
         Mockito.when(tag.getTagDefinitionId()).thenReturn(UUID.randomUUID());
+        Mockito.when(tag.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 58, DateTimeZone.UTC));
 
         tagDefinition = Mockito.mock(TagDefinition.class);
         Mockito.when(tagDefinition.getId()).thenReturn(UUID.randomUUID());
@@ -308,6 +318,7 @@ public abstract class AnalyticsTestSuiteNoDB {
         Mockito.when(tagDefinition.getDescription()).thenReturn(UUID.randomUUID().toString());
         Mockito.when(tagDefinition.isControlTag()).thenReturn(false);
         Mockito.when(tagDefinition.getApplicableObjectTypes()).thenReturn(ImmutableList.<ObjectType>of(ObjectType.INVOICE));
+        Mockito.when(tagDefinition.getCreatedDate()).thenReturn(new DateTime(2016, 1, 22, 10, 56, 59, DateTimeZone.UTC));
 
         auditLog = Mockito.mock(AuditLog.class);
         Mockito.when(auditLog.getId()).thenReturn(UUID.randomUUID());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessAccount.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessAccount.java
index 97dd7d9..ae60a88 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessAccount.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessAccount.java
@@ -38,6 +38,7 @@ public class TestBusinessAccount extends AnalyticsTestSuiteNoDB {
         final BusinessAccount businessAccount = new BusinessAccount(accountModelDao);
 
         verifyBusinessEntityBase(businessAccount);
+        Assert.assertEquals(businessAccount.getCreatedDate(), accountModelDao.getCreatedDate());
         Assert.assertEquals(businessAccount.getEmail(), accountModelDao.getEmail());
         Assert.assertEquals(businessAccount.getFirstNameLength(), accountModelDao.getFirstNameLength());
         Assert.assertEquals(businessAccount.getCurrency(), accountModelDao.getCurrency());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessField.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessField.java
index afdd492..ec1db34 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessField.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessField.java
@@ -68,6 +68,7 @@ public class TestBusinessField extends AnalyticsTestSuiteNoDB {
 
     private void verifyBusinessField(final BusinessField accountField) {
         verifyBusinessEntityBase(accountField);
+        Assert.assertEquals(accountField.getCreatedDate(), customField.getCreatedDate());
         Assert.assertEquals(accountField.getName(), customField.getFieldName());
         Assert.assertEquals(accountField.getValue(), customField.getFieldValue());
     }

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java
index 95c2014..bec57d8 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java
@@ -48,6 +48,7 @@ public class TestBusinessInvoice extends AnalyticsTestSuiteNoDB {
         final BusinessInvoice businessInvoice = new BusinessInvoice(invoiceModelDao,
                                                                     ImmutableList.<BusinessInvoiceItemBaseModelDao>of(invoiceItemBaseModelDao));
         verifyBusinessEntityBase(businessInvoice);
+        Assert.assertEquals(businessInvoice.getCreatedDate(), invoiceModelDao.getCreatedDate());
         Assert.assertEquals(businessInvoice.getInvoiceId(), invoiceModelDao.getInvoiceId());
         Assert.assertEquals(businessInvoice.getInvoiceNumber(), invoiceModelDao.getInvoiceNumber());
         Assert.assertEquals(businessInvoice.getInvoiceDate(), invoiceModelDao.getInvoiceDate());
@@ -62,6 +63,7 @@ public class TestBusinessInvoice extends AnalyticsTestSuiteNoDB {
 
         final BusinessInvoiceItem businessInvoiceItem = businessInvoice.getInvoiceItems().get(0);
         verifyBusinessEntityBase(businessInvoiceItem);
+        Assert.assertEquals(businessInvoiceItem.getCreatedDate(), invoiceItemBaseModelDao.getCreatedDate());
         Assert.assertEquals(businessInvoiceItem.getItemId(), invoiceItemBaseModelDao.getItemId());
         Assert.assertEquals(businessInvoiceItem.getInvoiceId(), invoiceItemBaseModelDao.getInvoiceId());
         Assert.assertEquals(businessInvoiceItem.getInvoiceNumber(), invoiceItemBaseModelDao.getInvoiceNumber());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java
index 9a381e3..b2e8768 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java
@@ -38,6 +38,7 @@ public class TestBusinessInvoiceItem extends AnalyticsTestSuiteNoDB {
                                                                                                                tenantRecordId);
         final BusinessInvoiceItem businessInvoiceItem = new BusinessInvoiceItem(invoiceItemBaseModelDao);
         verifyBusinessEntityBase(businessInvoiceItem);
+        Assert.assertEquals(businessInvoiceItem.getCreatedDate(), invoiceItemBaseModelDao.getCreatedDate());
         Assert.assertEquals(businessInvoiceItem.getItemId(), invoiceItemBaseModelDao.getItemId());
         Assert.assertEquals(businessInvoiceItem.getInvoiceId(), invoiceItemBaseModelDao.getInvoiceId());
         Assert.assertEquals(businessInvoiceItem.getInvoiceNumber(), invoiceItemBaseModelDao.getInvoiceNumber());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoicePayment.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoicePayment.java
index c4c326d..375d5e0 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoicePayment.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoicePayment.java
@@ -38,6 +38,7 @@ public class TestBusinessInvoicePayment extends AnalyticsTestSuiteNoDB {
                                                                                                                     tenantRecordId);
         final BusinessInvoicePayment businessInvoicePayment = new BusinessInvoicePayment(invoicePaymentBaseModelDao);
         verifyBusinessEntityBase(businessInvoicePayment);
+        Assert.assertEquals(businessInvoicePayment.getCreatedDate(), invoicePaymentBaseModelDao.getCreatedDate());
         Assert.assertEquals(businessInvoicePayment.getInvoicePaymentId(), invoicePaymentBaseModelDao.getInvoicePaymentId());
         Assert.assertEquals(businessInvoicePayment.getInvoiceId(), invoicePaymentBaseModelDao.getInvoiceId());
         Assert.assertEquals(businessInvoicePayment.getInvoiceNumber(), invoicePaymentBaseModelDao.getInvoiceNumber());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessOverdueStatus.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessOverdueStatus.java
index 12bf3e3..cfa7632 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessOverdueStatus.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessOverdueStatus.java
@@ -40,6 +40,7 @@ public class TestBusinessOverdueStatus extends AnalyticsTestSuiteNoDB {
                                                                                                               tenantRecordId);
         final BusinessOverdueStatus businessOverdueStatus = new BusinessOverdueStatus(businessOverdueStatusModelDao);
         verifyBusinessEntityBase(businessOverdueStatus);
+        Assert.assertEquals(businessOverdueStatus.getCreatedDate(), businessOverdueStatusModelDao.getCreatedDate());
         Assert.assertEquals(businessOverdueStatus.getObjectType(), ObjectType.BUNDLE.toString());
         Assert.assertEquals(businessOverdueStatus.getStatus(), businessOverdueStatusModelDao.getStatus());
         Assert.assertEquals(businessOverdueStatus.getStartDate(), businessOverdueStatusModelDao.getStartDate());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSubscriptionTransition.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSubscriptionTransition.java
index 9c1d3b5..2b6a546 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSubscriptionTransition.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSubscriptionTransition.java
@@ -52,6 +52,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuiteNoDB {
         final BusinessSubscriptionTransition businessSubscriptionTransition = new BusinessSubscriptionTransition(subscriptionTransitionModelDao);
 
         verifyBusinessEntityBase(businessSubscriptionTransition);
+        Assert.assertEquals(businessSubscriptionTransition.getCreatedDate(), subscriptionTransitionModelDao.getCreatedDate());
         Assert.assertEquals(businessSubscriptionTransition.getBundleId(), subscriptionTransitionModelDao.getBundleId());
         Assert.assertEquals(businessSubscriptionTransition.getBundleExternalKey(), subscriptionTransitionModelDao.getBundleExternalKey());
         Assert.assertEquals(businessSubscriptionTransition.getSubscriptionId(), subscriptionTransitionModelDao.getSubscriptionId());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessTag.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessTag.java
index 90d0edc..8df62d7 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessTag.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessTag.java
@@ -71,6 +71,7 @@ public class TestBusinessTag extends AnalyticsTestSuiteNoDB {
 
     private void verifyBusinessTag(final BusinessTag accountTag) {
         verifyBusinessEntityBase(accountTag);
+        Assert.assertEquals(accountTag.getCreatedDate(), accountTag.getCreatedDate());
         Assert.assertEquals(accountTag.getName(), accountTag.getName());
     }
 }

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountFieldModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountFieldModelDao.java
index 5b9bb9b..2d7a5ab 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountFieldModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountFieldModelDao.java
@@ -32,6 +32,7 @@ public class TestBusinessAccountFieldModelDao extends AnalyticsTestSuiteNoDB {
                                                                                                    auditLog,
                                                                                                    tenantRecordId);
         verifyBusinessModelDaoBase(accountFieldModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(accountFieldModelDao.getCreatedDate(), customField.getCreatedDate());
         Assert.assertEquals(accountFieldModelDao.getCustomFieldRecordId(), fieldRecordId);
         Assert.assertEquals(accountFieldModelDao.getName(), customField.getFieldName());
         Assert.assertEquals(accountFieldModelDao.getValue(), customField.getFieldValue());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountModelDao.java
index 5cb258e..a94d484 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountModelDao.java
@@ -59,10 +59,14 @@ public class TestBusinessAccountModelDao extends AnalyticsTestSuiteNoDB {
 
     private void verifyAccountFields(final BusinessAccountModelDao accountModelDao) {
         verifyBusinessModelDaoBase(accountModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(accountModelDao.getCreatedDate(), account.getCreatedDate());
         Assert.assertEquals(accountModelDao.getEmail(), account.getEmail());
         Assert.assertEquals(accountModelDao.getFirstNameLength(), account.getFirstNameLength());
         Assert.assertEquals(accountModelDao.getCurrency(), account.getCurrency().toString());
         Assert.assertEquals(accountModelDao.getBillingCycleDayLocal(), account.getBillCycleDayLocal());
+        Assert.assertEquals(accountModelDao.getPaymentMethodId(), account.getPaymentMethodId());
+        Assert.assertEquals(accountModelDao.getTimeZone(), account.getTimeZone().toString());
+        Assert.assertEquals(accountModelDao.getLocale(), account.getLocale());
         Assert.assertEquals(accountModelDao.getAddress1(), account.getAddress1());
         Assert.assertEquals(accountModelDao.getAddress2(), account.getAddress2());
         Assert.assertEquals(accountModelDao.getCompanyName(), account.getCompanyName());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountTagModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountTagModelDao.java
index 750c00a..f28c684 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountTagModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessAccountTagModelDao.java
@@ -33,6 +33,7 @@ public class TestBusinessAccountTagModelDao extends AnalyticsTestSuiteNoDB {
                                                                                       auditLog,
                                                                                       tenantRecordId);
         verifyBusinessModelDaoBase(tagModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(tagModelDao.getCreatedDate(), tag.getCreatedDate());
         Assert.assertEquals(tagModelDao.getTagRecordId(), tagRecordId);
         Assert.assertEquals(tagModelDao.getName(), tagDefinition.getName());
     }

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceFieldModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceFieldModelDao.java
index 4bc36ff..9cf0392 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceFieldModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceFieldModelDao.java
@@ -32,6 +32,7 @@ public class TestBusinessInvoiceFieldModelDao extends AnalyticsTestSuiteNoDB {
                                                                                                    auditLog,
                                                                                                    tenantRecordId);
         verifyBusinessModelDaoBase(invoiceFieldModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(invoiceFieldModelDao.getCreatedDate(), customField.getCreatedDate());
         Assert.assertEquals(invoiceFieldModelDao.getCustomFieldRecordId(), fieldRecordId);
         Assert.assertEquals(invoiceFieldModelDao.getInvoiceId(), customField.getObjectId());
         Assert.assertEquals(invoiceFieldModelDao.getName(), customField.getFieldName());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java
index fc802ad..8895b02 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java
@@ -43,7 +43,6 @@ public class TestBusinessInvoiceItemModelDao extends AnalyticsTestSuiteNoDB {
         Assert.assertNull(invoiceItemModelDao.getSlug());
         Assert.assertNull(invoiceItemModelDao.getPhase());
         Assert.assertNull(invoiceItemModelDao.getBillingPeriod());
-        Assert.assertNull(invoiceItemModelDao.getEndDate());
     }
 
     @Test(groups = "fast")
@@ -66,11 +65,11 @@ public class TestBusinessInvoiceItemModelDao extends AnalyticsTestSuiteNoDB {
         Assert.assertEquals(invoiceItemModelDao.getSlug(), phase.getName());
         Assert.assertEquals(invoiceItemModelDao.getPhase(), phase.getPhaseType().toString());
         Assert.assertEquals(invoiceItemModelDao.getBillingPeriod(), phase.getBillingPeriod().toString());
-        Assert.assertEquals(invoiceItemModelDao.getEndDate(), invoiceItem.getStartDate().plus(phase.getDuration().toJodaPeriod()));
     }
 
     private void verifyInvoiceItemFields(final BusinessInvoiceItemModelDao invoiceItemModelDao) {
         verifyBusinessModelDaoBase(invoiceItemModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(invoiceItemModelDao.getCreatedDate(), invoiceItem.getCreatedDate());
         Assert.assertEquals(invoiceItemModelDao.getInvoiceItemRecordId(), invoiceItemRecordId);
         Assert.assertEquals(invoiceItemModelDao.getItemId(), invoiceItem.getId());
         Assert.assertEquals(invoiceItemModelDao.getInvoiceId(), invoice.getId());
@@ -90,5 +89,6 @@ public class TestBusinessInvoiceItemModelDao extends AnalyticsTestSuiteNoDB {
         Assert.assertEquals(invoiceItemModelDao.getAmount(), invoiceItem.getAmount());
         Assert.assertEquals(invoiceItemModelDao.getCurrency(), invoiceItem.getCurrency().toString());
         Assert.assertEquals(invoiceItemModelDao.getLinkedItemId(), invoiceItem.getLinkedItemId());
+        Assert.assertEquals(invoiceItemModelDao.getEndDate(), invoiceItem.getEndDate());
     }
 }

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceModelDao.java
index ad1e378..980c8f2 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceModelDao.java
@@ -32,7 +32,8 @@ public class TestBusinessInvoiceModelDao extends AnalyticsTestSuiteNoDB {
                                                                                     auditLog,
                                                                                     tenantRecordId);
         verifyBusinessModelDaoBase(invoiceModelDao, accountRecordId, tenantRecordId);
-        Assert.assertEquals(invoiceModelDao.getInvoiceRecordId(), invoiceItemRecordId);
+        Assert.assertEquals(invoiceModelDao.getCreatedDate(), invoice.getCreatedDate());
+        Assert.assertEquals(invoiceModelDao.getInvoiceRecordId(), invoiceRecordId);
         Assert.assertEquals(invoiceModelDao.getInvoiceId(), invoice.getId());
         Assert.assertEquals(invoiceModelDao.getInvoiceNumber(), invoice.getInvoiceNumber());
         Assert.assertEquals(invoiceModelDao.getInvoiceDate(), invoice.getInvoiceDate());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentFieldModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentFieldModelDao.java
index 9d46391..554b56b 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentFieldModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentFieldModelDao.java
@@ -32,6 +32,7 @@ public class TestBusinessInvoicePaymentFieldModelDao extends AnalyticsTestSuiteN
                                                                                                                         auditLog,
                                                                                                                         tenantRecordId);
         verifyBusinessModelDaoBase(invoicePaymentFieldModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(invoicePaymentFieldModelDao.getCreatedDate(), customField.getCreatedDate());
         Assert.assertEquals(invoicePaymentFieldModelDao.getCustomFieldRecordId(), fieldRecordId);
         Assert.assertEquals(invoicePaymentFieldModelDao.getInvoicePaymentId(), customField.getObjectId());
         Assert.assertEquals(invoicePaymentFieldModelDao.getName(), customField.getFieldName());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentModelDao.java
index e53fd35..f0d9e88 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentModelDao.java
@@ -35,13 +35,14 @@ public class TestBusinessInvoicePaymentModelDao extends AnalyticsTestSuiteNoDB {
                                                                                                          auditLog,
                                                                                                          tenantRecordId);
         verifyBusinessModelDaoBase(invoicePaymentModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(invoicePaymentModelDao.getCreatedDate(), invoicePayment.getCreatedDate());
         Assert.assertEquals(invoicePaymentModelDao.getInvoicePaymentRecordId(), invoicePaymentRecordId);
         Assert.assertEquals(invoicePaymentModelDao.getInvoicePaymentId(), invoicePayment.getId());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceId(), invoice.getId());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceNumber(), invoice.getInvoiceNumber());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceCreatedDate(), invoice.getCreatedDate());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceDate(), invoice.getInvoiceDate());
-        Assert.assertEquals(invoicePaymentModelDao.getInvoiceTargetDate(), invoice.getInvoiceDate());
+        Assert.assertEquals(invoicePaymentModelDao.getInvoiceTargetDate(), invoice.getTargetDate());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceCurrency(), invoice.getCurrency().toString());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceBalance(), invoice.getBalance());
         Assert.assertEquals(invoicePaymentModelDao.getInvoiceAmountPaid(), invoice.getPaidAmount());
@@ -51,7 +52,7 @@ public class TestBusinessInvoicePaymentModelDao extends AnalyticsTestSuiteNoDB {
         Assert.assertEquals(invoicePaymentModelDao.getInvoicePaymentType(), invoicePayment.getType().toString());
         //Assert.assertEquals(invoicePaymentModelDao.getPaymentNumber(), /* TODO */);
         Assert.assertEquals(invoicePaymentModelDao.getLinkedInvoicePaymentId(), invoicePayment.getLinkedInvoicePaymentId());
-        Assert.assertEquals(invoicePaymentModelDao.getAmount(), payment.getAmount());
-        Assert.assertEquals(invoicePaymentModelDao.getCurrency(), payment.getCurrency().toString());
+        Assert.assertEquals(invoicePaymentModelDao.getAmount(), invoicePayment.getAmount());
+        Assert.assertEquals(invoicePaymentModelDao.getCurrency(), invoicePayment.getCurrency().toString());
     }
 }

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentTagModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentTagModelDao.java
index 30e4dd8..0d4bda1 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentTagModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoicePaymentTagModelDao.java
@@ -33,6 +33,7 @@ public class TestBusinessInvoicePaymentTagModelDao extends AnalyticsTestSuiteNoD
                                                                                                                   auditLog,
                                                                                                                   tenantRecordId);
         verifyBusinessModelDaoBase(invoicePaymentTagModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(invoicePaymentTagModelDao.getCreatedDate(), tag.getCreatedDate());
         Assert.assertEquals(invoicePaymentTagModelDao.getTagRecordId(), tagRecordId);
         Assert.assertEquals(invoicePaymentTagModelDao.getInvoicePaymentId(), tag.getObjectId());
         Assert.assertEquals(invoicePaymentTagModelDao.getName(), tagDefinition.getName());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceTagModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceTagModelDao.java
index 5eb3f24..2b05827 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceTagModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceTagModelDao.java
@@ -33,6 +33,7 @@ public class TestBusinessInvoiceTagModelDao extends AnalyticsTestSuiteNoDB {
                                                                                              auditLog,
                                                                                              tenantRecordId);
         verifyBusinessModelDaoBase(invoiceTagModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(invoiceTagModelDao.getCreatedDate(), tag.getCreatedDate());
         Assert.assertEquals(invoiceTagModelDao.getTagRecordId(), tagRecordId);
         Assert.assertEquals(invoiceTagModelDao.getInvoiceId(), tag.getObjectId());
         Assert.assertEquals(invoiceTagModelDao.getName(), tagDefinition.getName());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessOverdueStatusModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessOverdueStatusModelDao.java
index 0a6a218..83b41d9 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessOverdueStatusModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessOverdueStatusModelDao.java
@@ -37,6 +37,7 @@ public class TestBusinessOverdueStatusModelDao extends AnalyticsTestSuiteNoDB {
                                                                                                       auditLog,
                                                                                                       tenantRecordId);
         verifyBusinessModelDaoBase(overdueStatusModelDao, accountRecordId, tenantRecordId);
+        Assert.assertEquals(overdueStatusModelDao.getCreatedDate(), blockingState.getCreatedDate());
         Assert.assertEquals(overdueStatusModelDao.getBlockingStateRecordId(), blockingStateRecordId);
         Assert.assertEquals(overdueStatusModelDao.getBundleId(), bundle.getId());
         Assert.assertEquals(overdueStatusModelDao.getBundleExternalKey(), bundle.getExternalKey());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscription.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscription.java
index 91dcf8e..086e8a5 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscription.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscription.java
@@ -111,7 +111,7 @@ public class TestBusinessSubscription extends AnalyticsTestSuiteNoDB {
 
     @Test(groups = "fast")
     public void testConstructorWithNulls() throws Exception {
-        final DateTime startDate = new DateTime(2019, 7, 4, 29, 3, 11, DateTimeZone.UTC);
+        final DateTime startDate = new DateTime(2019, 7, 4, 23, 3, 11, DateTimeZone.UTC);
         final BusinessSubscription businessSubscription = new BusinessSubscription(null,
                                                                                    null,
                                                                                    null,
@@ -127,7 +127,7 @@ public class TestBusinessSubscription extends AnalyticsTestSuiteNoDB {
         Assert.assertNull(businessSubscription.getPrice());
         Assert.assertNull(businessSubscription.getPriceList(), priceList.getName());
         Assert.assertEquals(businessSubscription.getCurrency(), Currency.GBP.toString());
-        Assert.assertEquals(businessSubscription.getState(), SubscriptionState.ACTIVE);
+        Assert.assertEquals(businessSubscription.getState(), SubscriptionState.ACTIVE.toString());
         //Assert.assertEquals(businessSubscription.getBusinessActive(), /* TODO */);
         Assert.assertEquals(businessSubscription.getStartDate(), startDate);
         Assert.assertNull(businessSubscription.getEndDate());
@@ -136,7 +136,7 @@ public class TestBusinessSubscription extends AnalyticsTestSuiteNoDB {
 
     @Test(groups = "fast")
     public void testConstructorWithoutNulls() throws Exception {
-        final DateTime startDate = new DateTime(2019, 7, 4, 29, 3, 11, DateTimeZone.UTC);
+        final DateTime startDate = new DateTime(2019, 7, 4, 9, 3, 11, DateTimeZone.UTC);
         final BusinessSubscription businessSubscription = new BusinessSubscription(plan,
                                                                                    phase,
                                                                                    priceList,
@@ -152,7 +152,7 @@ public class TestBusinessSubscription extends AnalyticsTestSuiteNoDB {
         Assert.assertEquals(businessSubscription.getPrice(), phase.getRecurringPrice());
         Assert.assertEquals(businessSubscription.getPriceList(), priceList.getName());
         Assert.assertEquals(businessSubscription.getCurrency(), Currency.GBP.toString());
-        Assert.assertEquals(businessSubscription.getState(), SubscriptionState.ACTIVE);
+        Assert.assertEquals(businessSubscription.getState(), SubscriptionState.ACTIVE.toString());
         //Assert.assertEquals(businessSubscription.getBusinessActive(), /* TODO */);
         Assert.assertEquals(businessSubscription.getStartDate(), startDate);
         Assert.assertNull(businessSubscription.getEndDate());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java
index e4de1b0..2ce6975 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionEvent.java
@@ -46,6 +46,6 @@ public class TestBusinessSubscriptionEvent extends AnalyticsTestSuiteNoDB {
         final BusinessSubscriptionEvent event = BusinessSubscriptionEvent.fromTransition(subscriptionTransition);
         Assert.assertEquals(event.getEventType(), BusinessSubscriptionEvent.EventType.ADD);
         Assert.assertEquals(event.getCategory(), subscriptionTransition.getNextPlan().getProduct().getCategory());
-        Assert.assertEquals(event.toString(), "ADD_BASE");
+        Assert.assertEquals(event.toString(), "ADD_" + plan.getProduct().getCategory().toString());
     }
 }

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionTransitionModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionTransitionModelDao.java
index 755a0e1..09ec0d3 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionTransitionModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessSubscriptionTransitionModelDao.java
@@ -47,7 +47,8 @@ public class TestBusinessSubscriptionTransitionModelDao extends AnalyticsTestSui
                                                                                                                                  auditLog,
                                                                                                                                  tenantRecordId);
         verifyBusinessModelDaoBase(subscriptionTransitionModelDao, accountRecordId, tenantRecordId);
-        //Assert.assertEquals(subscriptionTransitionModelDao.getSubscriptionEventRecordId(), /* TODO */);
+        Assert.assertEquals(subscriptionTransitionModelDao.getCreatedDate(), subscriptionTransition.getNextEventCreatedDate());
+        Assert.assertEquals(subscriptionTransitionModelDao.getSubscriptionEventRecordId(), subscriptionEventRecordId);
         Assert.assertEquals(subscriptionTransitionModelDao.getBundleId(), bundle.getId());
         Assert.assertEquals(subscriptionTransitionModelDao.getBundleExternalKey(), bundle.getExternalKey());
         Assert.assertEquals(subscriptionTransitionModelDao.getSubscriptionId(), subscriptionTransition.getSubscriptionId());

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/TestAnalyticsDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/TestAnalyticsDao.java
index bd8be6b..ddce78d 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/TestAnalyticsDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/TestAnalyticsDao.java
@@ -29,7 +29,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
 
     @Test(groups = "slow")
     public void testDao() throws Exception {
-        final AnalyticsDao analyticsDao = new AnalyticsDao(killbillDataSource);
+        final AnalyticsDao analyticsDao = new AnalyticsDao(killbillAPI, killbillDataSource);
         Assert.assertNull(analyticsDao.getAccountById(account.getId(), callContext));
 
         final BusinessAccountModelDao accountModelDao = new BusinessAccountModelDao(account,