killbill-aplcache

diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java
index bddef30..240b0eb 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java
@@ -108,6 +108,7 @@ public class TestAccountJson extends JaxrsTestSuiteNoDB {
         accountBuilder.postalCode(UUID.randomUUID().toString());
         accountBuilder.stateOrProvince(UUID.randomUUID().toString());
         accountBuilder.timeZone(DateTimeZone.UTC);
+        accountBuilder.parentAccountId(UUID.randomUUID());
         final Account account = accountBuilder.build();
 
         final AccountJson accountJson = new AccountJson(account, null, null, null);
@@ -128,5 +129,6 @@ public class TestAccountJson extends JaxrsTestSuiteNoDB {
         Assert.assertEquals(accountJson.isNotifiedForInvoices(), account.isNotifiedForInvoices());
         Assert.assertEquals(accountJson.getState(), account.getStateOrProvince());
         Assert.assertEquals(accountJson.getTimeZone(), account.getTimeZone().toString());
+        Assert.assertEquals(accountJson.getParentAccountId(), account.getParentAccountId().toString());
     }
 }

diff --git a/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java b/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java
index 5bdd7c9..b64454d 100644
--- a/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java
+++ b/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java
@@ -34,6 +34,7 @@ public class MockAccountBuilder {
     private String name = "";
     private int firstNameLength;
     private Currency currency = Currency.USD;
+    private UUID parentAccountId;
     private int billingCycleDayLocal;
     private UUID paymentMethodId;
     private DateTimeZone timeZone = DateTimeZone.UTC;
@@ -68,6 +69,7 @@ public class MockAccountBuilder {
         this.companyName(data.getCompanyName());
         this.country(data.getCountry());
         this.currency(data.getCurrency());
+        this.parentAccountId(data.getParentAccountId());
         this.email(data.getEmail());
         this.externalKey(data.getExternalKey());
         this.firstNameLength(data.getFirstNameLength());
@@ -112,6 +114,11 @@ public class MockAccountBuilder {
         return this;
     }
 
+    public MockAccountBuilder parentAccountId(final UUID parentAccountId) {
+        this.parentAccountId = parentAccountId;
+        return this;
+    }
+
     public MockAccountBuilder paymentMethodId(final UUID paymentMethodId) {
         this.paymentMethodId = paymentMethodId;
         return this;
@@ -314,7 +321,7 @@ public class MockAccountBuilder {
 
             @Override
             public UUID getParentAccountId() {
-                return null;
+                return parentAccountId;
             }
 
             @Override