killbill-aplcache

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java
index 988daed..a03076f 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonNoEvents.java
@@ -67,9 +67,14 @@ public class SubscriptionJsonNoEvents extends SubscriptionJsonSimple {
     }
 
     public SubscriptionJsonNoEvents(final Subscription data) {
-        this(data.getId().toString(), data.getBundleId().toString(), data.getStartDate(), data.getCurrentPlan().getProduct().getName(),
-             data.getCurrentPlan().getProduct().getCategory().toString(), data.getCurrentPlan().getBillingPeriod().toString(),
-             data.getCurrentPriceList().getName(), data.getChargedThroughDate(),
+        this(data.getId().toString(),
+             data.getBundleId().toString(),
+             data.getStartDate(),
+             data.getCurrentPlan() != null ? data.getCurrentPlan().getProduct().getName() : null,
+             data.getCurrentPlan() != null ?data.getCurrentPlan().getProduct().getCategory().toString() : null,
+             data.getCurrentPlan() != null ?data.getCurrentPlan().getBillingPeriod().toString() : null,
+             data.getCurrentPriceList() != null ? data.getCurrentPriceList().getName() : null,
+             data.getChargedThroughDate(),
              data.getEndDate() != null ? data.getEndDate() : data.getFutureEndDate());
     }
 

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java b/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
index 6ccdce6..b3f30ff 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
@@ -125,7 +125,7 @@ public class TestAccount extends TestJaxrsBase {
         assertNotNull(subscriptionJson);
 
         // MOVE AFTER TRIAL
-        clock.addMonths(3);
+        clock.addDays(31);
 
         crappyWaitForLackOfProperSynchonization();
 
@@ -138,8 +138,8 @@ public class TestAccount extends TestJaxrsBase {
         assertNotNull(objFromJson);
         log.info(baseJson);
 
-        Assert.assertEquals(objFromJson.getPayments().size(), 3);
-        Assert.assertEquals(objFromJson.getInvoices().size(), 4);
+        Assert.assertEquals(objFromJson.getPayments().size(), 1);
+        Assert.assertEquals(objFromJson.getInvoices().size(), 2);
         Assert.assertEquals(objFromJson.getBundles().size(), 1);
         Assert.assertEquals(objFromJson.getBundles().get(0).getSubscriptions().size(), 1);
         Assert.assertEquals(objFromJson.getBundles().get(0).getSubscriptions().get(0).getEvents().size(), 2);

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java b/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
index e1c0806..adb005b 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
@@ -130,8 +130,7 @@ public class TestInvoice extends TestJaxrsBase {
         final SubscriptionJsonNoEvents subscriptionJson = createSubscription(bundleJson.getBundleId(), "Shotgun", ProductCategory.BASE.toString(), BillingPeriod.MONTHLY.toString(), true);
         assertNotNull(subscriptionJson);
 
-        // MOVE AFTER TRIAL
-        clock.addMonths(3);
+        clock.addDays(31);
 
         crappyWaitForLackOfProperSynchonization();
 
@@ -144,7 +143,7 @@ public class TestInvoice extends TestJaxrsBase {
         final List<InvoiceJsonSimple> invoices = mapper.readValue(baseJson, new TypeReference<List<InvoiceJsonSimple>>() {});
         assertNotNull(invoices);
         log.info(baseJson);
-        assertEquals(invoices.size(), 4);
+        assertEquals(invoices.size(), 2);
 
         for (final InvoiceJsonSimple cur : invoices) {
 

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java b/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
index 9e2d92f..83feb57 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
@@ -92,7 +92,7 @@ public class TestSubscription extends TestJaxrsBase {
         assertTrue(objFromJson.equalsNoSubscriptionIdNoStartDateNoCTD(newInput));
 
         // MOVE AFTER TRIAL
-        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusMonths(3).plusDays(1));
+        final Interval it = new Interval(clock.getUTCNow(), clock.getUTCNow().plusDays(31));
         clock.addDeltaFromReality(it.toDurationMillis());
 
         crappyWaitForLackOfProperSynchonization();
@@ -107,6 +107,7 @@ public class TestSubscription extends TestJaxrsBase {
         // Retrieves to check EndDate
         uri = JaxrsResource.SUBSCRIPTIONS_PATH + "/" + subscriptionJson.getSubscriptionId().toString();
         response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
+
         assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
         baseJson = response.getResponseBody();
         objFromJson = mapper.readValue(baseJson, SubscriptionJsonNoEvents.class);