killbill-aplcache

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java
index 3cc2e00..9736a04 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java
@@ -17,43 +17,24 @@
 
 package org.killbill.billing.jaxrs;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
 
-import javax.annotation.Nullable;
-
-import org.killbill.billing.client.KillBillClientException;
-import org.killbill.billing.client.RequestOptions;
 import org.killbill.billing.client.model.Account;
-import org.killbill.billing.client.model.ComboPaymentTransaction;
-import org.killbill.billing.client.model.Payment;
-import org.killbill.billing.client.model.PaymentMethod;
-import org.killbill.billing.client.model.PaymentMethodPluginDetail;
-import org.killbill.billing.client.model.PaymentTransaction;
 import org.killbill.billing.client.model.Payments;
-import org.killbill.billing.client.model.PluginProperty;
 import org.killbill.billing.client.model.Tenant;
 import org.killbill.billing.client.model.TenantKey;
 import org.killbill.billing.osgi.api.OSGIServiceRegistration;
 import org.killbill.billing.payment.api.TransactionStatus;
-import org.killbill.billing.payment.api.TransactionType;
 import org.killbill.billing.payment.plugin.api.PaymentPluginApi;
-import org.killbill.billing.payment.plugin.api.PaymentPluginStatus;
 import org.killbill.billing.payment.provider.MockPaymentProviderPlugin;
 import org.killbill.billing.util.jackson.ObjectMapper;
 import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.inject.Inject;
 
-import static org.testng.Assert.assertEquals;
-
 public class TestPerTenantConfig extends TestJaxrsBase {
 
     @Inject
@@ -65,6 +46,10 @@ public class TestPerTenantConfig extends TestJaxrsBase {
     public void beforeMethod() throws Exception {
         super.beforeMethod();
         mockPaymentProviderPlugin = (MockPaymentProviderPlugin) registry.getServiceForName(PLUGIN_NAME);
+    }
+
+    @AfterMethod(groups = "slow")
+    public void tearDown() throws Exception {
         mockPaymentProviderPlugin.clear();
     }
 
@@ -140,8 +125,5 @@ public class TestPerTenantConfig extends TestJaxrsBase {
         Assert.assertEquals(payments4.get(0).getTransactions().get(0).getStatus(), TransactionStatus.PAYMENT_FAILURE.name());
         Assert.assertEquals(payments4.get(0).getTransactions().get(1).getStatus(), TransactionStatus.PAYMENT_FAILURE.name());
         Assert.assertEquals(payments4.get(0).getTransactions().get(2).getStatus(), TransactionStatus.SUCCESS.name());
-
     }
-
-
 }

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/dao/TenantBroadcastModelDao.java b/tenant/src/main/java/org/killbill/billing/tenant/dao/TenantBroadcastModelDao.java
index 9cbf4ef..9a2f554 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/dao/TenantBroadcastModelDao.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/dao/TenantBroadcastModelDao.java
@@ -81,6 +81,20 @@ public class TenantBroadcastModelDao extends EntityModelDaoBase implements Entit
     }
 
     @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("TenantBroadcastModelDao{");
+        sb.append("recordId=").append(getRecordId());
+        sb.append(", accountRecordId=").append(getAccountRecordId());
+        sb.append(", tenantRecordId=").append(getTenantRecordId());
+        sb.append(", type='").append(type).append('\'');
+        sb.append(", targetRecordId=").append(targetRecordId);
+        sb.append(", targetTableName=").append(targetTableName);
+        sb.append(", userToken=").append(userToken);
+        sb.append('}');
+        return sb.toString();
+    }
+
+    @Override
     public boolean equals(final Object o) {
         if (this == o) {
             return true;

diff --git a/util/src/main/java/org/killbill/billing/util/entity/dao/EntityModelDaoBase.java b/util/src/main/java/org/killbill/billing/util/entity/dao/EntityModelDaoBase.java
index 824935f..69d6647 100644
--- a/util/src/main/java/org/killbill/billing/util/entity/dao/EntityModelDaoBase.java
+++ b/util/src/main/java/org/killbill/billing/util/entity/dao/EntityModelDaoBase.java
@@ -66,4 +66,14 @@ public class EntityModelDaoBase extends EntityBase {
     public void setTenantRecordId(final Long tenantRecordId) {
         this.tenantRecordId = tenantRecordId;
     }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("EntityModelDaoBase{");
+        sb.append("recordId=").append(recordId);
+        sb.append(", accountRecordId=").append(accountRecordId);
+        sb.append(", tenantRecordId=").append(tenantRecordId);
+        sb.append('}');
+        return sb.toString();
+    }
 }