killbill-memoizeit

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java b/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
index 2303e1d..bf71b41 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
@@ -96,7 +96,7 @@ public class MockPhase implements IPlanPhase
     @Override
     public BillingPeriod getBillingPeriod()
     {
-        return BillingPeriod.MONTHLY;
+        return null;
     }
 
     @Override

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java b/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java
index 958de9a..57e0b5b 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java
@@ -50,15 +50,15 @@ public class MockProduct implements IProduct
         return category;
     }
 
-	@Override
-	public IProduct[] getAvailable() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    @Override
+    public IProduct[] getAvailable()
+    {
+        return null;
+    }
 
-	@Override
-	public IProduct[] getIncluded() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    @Override
+    public IProduct[] getIncluded()
+    {
+        return null;
+    }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscription.java b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscription.java
index f185a2a..aea2c99 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscription.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscription.java
@@ -84,7 +84,7 @@ public class TestBusinessSubscription
         Assert.assertEquals(subscription.getRoundedMrr(), 0.0);
         Assert.assertEquals(subscription.getSlug(), phase.getName());
         Assert.assertEquals(subscription.getPhase(), phase.getPhaseType().toString());
-        Assert.assertEquals(subscription.getBillingPeriod(), phase.getBillingPeriod().toString());
+        Assert.assertEquals(subscription.getBillingPeriod(), phase.getBillingPeriod());
         Assert.assertEquals(subscription.getPrice(), phase.getRecurringPrice().getPrice(null));
         Assert.assertEquals(subscription.getProductCategory(), product.getCategory());
         Assert.assertEquals(subscription.getProductName(), product.getName());