killbill-aplcache

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
index caeb147..a74e005 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
@@ -23,6 +23,7 @@ import org.joda.time.DateTime;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ning.billing.payment.api.Payment;
+import com.ning.billing.payment.api.PaymentStatus;
 import com.ning.billing.util.clock.DefaultClock;
 
 public class PaymentJsonSimple {
@@ -85,7 +86,7 @@ public class PaymentJsonSimple {
 
     public PaymentJsonSimple(final Payment src) {
         this.amount = src.getAmount();
-        this.paidAmount = src.getAmount();
+        this.paidAmount =  src.getPaymentStatus() == PaymentStatus.SUCCESS ?  src.getAmount() : BigDecimal.ZERO;
         this.invoiceId = src.getInvoiceId().toString();
         this.accountId = src.getAccountId().toString();
         this.paymentId = src.getId().toString();

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 3d93c6d..e1c0806 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
@@ -61,9 +61,8 @@ public class TestInvoice extends TestJaxrsBase {
         assertNotNull(subscriptionJson);
 
         // 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(30));
         clock.addDeltaFromReality(it.toDurationMillis());
-
         crappyWaitForLackOfProperSynchonization();
 
         String uri = JaxrsResource.INVOICES_PATH;
@@ -76,7 +75,7 @@ public class TestInvoice extends TestJaxrsBase {
         List<InvoiceJsonSimple> objFromJson = mapper.readValue(baseJson, new TypeReference<List<InvoiceJsonSimple>>() {});
         assertNotNull(objFromJson);
         log.info(baseJson);
-        assertEquals(objFromJson.size(), 4);
+        assertEquals(objFromJson.size(), 2);
 
         // Check we can retrieve an individual invoice
         uri = JaxrsResource.INVOICES_PATH + "/" + objFromJson.get(0).getInvoiceId();
@@ -115,7 +114,7 @@ public class TestInvoice extends TestJaxrsBase {
         objFromJson = mapper.readValue(baseJson, new TypeReference<List<InvoiceJsonSimple>>() {});
         assertNotNull(objFromJson);
         log.info(baseJson);
-        assertEquals(objFromJson.size(), 5);
+        assertEquals(objFromJson.size(), 3);
     }
 
     @Test(groups = "slow")

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
index 5ef2bb7..b862741 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
@@ -511,7 +511,8 @@ public class TestJaxrsBase extends ServerTestSuiteWithEmbeddedDB {
     public AccountJson getAccountJson(final String name, final String externalKey, final String email) {
         final String accountId = UUID.randomUUID().toString();
         final int length = 4;
-        final int billCycleDay = 12;
+        // Let junction figure it out
+        final int billCycleDay = 0;
         final String currency = "USD";
         final String timeZone = "UTC";
         final String address1 = "12 rue des ecoles";