killbill-uncached

diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestExternalPaymentPlugin.java b/payment/src/test/java/org/killbill/billing/payment/api/TestExternalPaymentPlugin.java
index 75ebd4a..7d22863 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestExternalPaymentPlugin.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestExternalPaymentPlugin.java
@@ -37,11 +37,6 @@ public class TestExternalPaymentPlugin extends PaymentTestSuiteWithEmbeddedDB {
 
     private Account account;
 
-    @BeforeClass(groups = "slow")
-    protected void beforeClass() throws Exception {
-        super.beforeClass();
-    }
-
     @BeforeMethod(groups = "slow")
     public void beforeMethod() throws Exception {
         if (hasFailed()) {

diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
index d9d679c..5d45b6c 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
@@ -98,6 +98,10 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
     @BeforeClass(groups = "slow")
     protected void beforeClass() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
+
         super.beforeClass();
         mockPaymentProviderPlugin = (MockPaymentProviderPlugin) registry.getServiceForName(MockPaymentProviderPlugin.PLUGIN_NAME);
     }

diff --git a/payment/src/test/java/org/killbill/billing/payment/core/janitor/TestIncompletePaymentTransactionTaskWithDB.java b/payment/src/test/java/org/killbill/billing/payment/core/janitor/TestIncompletePaymentTransactionTaskWithDB.java
index f68d01a..2843ef0 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/janitor/TestIncompletePaymentTransactionTaskWithDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/janitor/TestIncompletePaymentTransactionTaskWithDB.java
@@ -54,6 +54,9 @@ public class TestIncompletePaymentTransactionTaskWithDB extends PaymentTestSuite
 
     @BeforeClass(groups = "slow")
     protected void beforeClass() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
         super.beforeClass();
 
         mockPaymentProviderPlugin = (MockPaymentProviderPlugin) registry.getServiceForName(MockPaymentProviderPlugin.PLUGIN_NAME);

diff --git a/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java b/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java
index c587c69..89daedc 100644
--- a/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java
+++ b/payment/src/test/java/org/killbill/billing/payment/dao/TestPaymentDao.java
@@ -54,8 +54,8 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
     @Test(groups = "slow")
     public void testPaymentAttempt() throws PluginPropertySerializerException {
         final UUID transactionId = UUID.randomUUID();
-        final String paymentExternalKey = "vraiment?";
-        final String transactionExternalKey = "tduteuqweq";
+        final String paymentExternalKey = UUID.randomUUID().toString();
+        final String transactionExternalKey = UUID.randomUUID().toString();
         final String stateName = "INIT";
         final TransactionType transactionType = TransactionType.AUTHORIZE;
         final String pluginName = "superPlugin";
@@ -100,9 +100,9 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
     public void testPaymentAndTransactions() {
         final UUID paymentMethodId = UUID.randomUUID();
         final UUID accountId = UUID.randomUUID();
-        final String externalKey = "hhhhooo";
-        final String transactionExternalKey = "grrrrrr";
-        final String transactionExternalKey2 = "hahahaha";
+        final String externalKey = UUID.randomUUID().toString();
+        final String transactionExternalKey = UUID.randomUUID().toString();
+        final String transactionExternalKey2 = UUID.randomUUID().toString();
 
         final DateTime utcNow = clock.getUTCNow();
 
@@ -301,11 +301,11 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
 
         final UUID paymentMethodId = UUID.randomUUID();
         final UUID accountId = UUID.randomUUID();
-        final String externalKey = "hhhhooo";
-        final String transactionExternalKey1 = "transaction1";
-        final String transactionExternalKey2 = "transaction2";
-        final String transactionExternalKey3 = "transaction3";
-        final String transactionExternalKey4 = "transaction4";
+        final String externalKey = UUID.randomUUID().toString();
+        final String transactionExternalKey1 = UUID.randomUUID().toString();
+        final String transactionExternalKey2 = UUID.randomUUID().toString();
+        final String transactionExternalKey3 = UUID.randomUUID().toString();
+        final String transactionExternalKey4 = UUID.randomUUID().toString();
 
         final DateTime initialTime = clock.getUTCNow().minusMinutes(1);
 
@@ -376,20 +376,20 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
 
     @Test(groups = "slow")
     public void testPaymentByStatesAcrossTenants() throws Exception {
-        final String externalKey1 = "XXhhhhooo1";
-        final String transactionExternalKey1 = "transactionXX1";
+        final String externalKey1 = UUID.randomUUID().toString();
+        final String transactionExternalKey1 = UUID.randomUUID().toString();
 
-        final String externalKey2 = "XXhhhhooo2";
-        final String transactionExternalKey2 = "transactionXX2";
+        final String externalKey2 = UUID.randomUUID().toString();
+        final String transactionExternalKey2 = UUID.randomUUID().toString();
 
-        final String externalKey3 = "XXhhhhooo3";
-        final String transactionExternalKey3 = "transactionXX3";
+        final String externalKey3 = UUID.randomUUID().toString();
+        final String transactionExternalKey3 = UUID.randomUUID().toString();
 
-        final String externalKey4 = "XXhhhhooo4";
-        final String transactionExternalKey4 = "transactionXX4";
+        final String externalKey4 = UUID.randomUUID().toString();
+        final String transactionExternalKey4 = UUID.randomUUID().toString();
 
-        final String externalKey5 = "XXhhhhooo5";
-        final String transactionExternalKey5 = "transactionXX5";
+        final String externalKey5 = UUID.randomUUID().toString();
+        final String transactionExternalKey5 = UUID.randomUUID().toString();
 
         final DateTime createdAfterDate = clock.getUTCNow().minusDays(10);
         final DateTime createdBeforeDate = clock.getUTCNow().minusDays(1);
@@ -542,8 +542,8 @@ public class TestPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
 
         final Account account = testHelper.createTestAccount(UUID.randomUUID().toString(), true);
 
-        final String externalKey1 = "2354";
-        final String transactionExternalKey1 = "jkjkjk";
+        final String externalKey1 = UUID.randomUUID().toString();
+        final String transactionExternalKey1 = UUID.randomUUID().toString();
 
         final String stateName = "RRRRR";
         final String pluginName = "elated";

diff --git a/payment/src/test/java/org/killbill/billing/payment/invoice/dao/TestInvoicePaymentControlDao.java b/payment/src/test/java/org/killbill/billing/payment/invoice/dao/TestInvoicePaymentControlDao.java
index 5768cbc..3a3b1e0 100644
--- a/payment/src/test/java/org/killbill/billing/payment/invoice/dao/TestInvoicePaymentControlDao.java
+++ b/payment/src/test/java/org/killbill/billing/payment/invoice/dao/TestInvoicePaymentControlDao.java
@@ -35,6 +35,10 @@ public class TestInvoicePaymentControlDao extends PaymentTestSuiteWithEmbeddedDB
 
     @BeforeClass(groups = "slow")
     protected void beforeClass() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
+
         super.beforeClass();
         dao = new InvoicePaymentControlDao(dbi);
     }

diff --git a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
index 63e9d69..0e6ce18 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
@@ -127,6 +127,9 @@ public class TestJanitor extends PaymentTestSuiteWithEmbeddedDB {
 
     @BeforeClass(groups = "slow")
     protected void beforeClass() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
         super.beforeClass();
         mockPaymentProviderPlugin = (MockPaymentProviderPlugin) registry.getServiceForName(MockPaymentProviderPlugin.PLUGIN_NAME);
     }

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java
index 235bfeb..d75073b 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java
@@ -315,7 +315,7 @@ public abstract class KillbillClient extends GuicyKillbillTestSuiteWithEmbeddedD
     }
 
 
-    protected void crappyWaitForLackOfProperSynchonization(int sleepValueMSec) throws Exception {
+    private void crappyWaitForLackOfProperSynchonization(int sleepValueMSec) throws Exception {
         Thread.sleep(sleepValueMSec);
     }