killbill-memoizeit

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java
index 928ba11..88cb7ea 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java
@@ -505,15 +505,10 @@ public class TestPayment extends TestJaxrsBase {
 
         final Payment initialPayment = createVerifyTransaction(account, paymentMethodId, paymentExternalKey, authTransactionExternalKey, transactionType, TransactionStatus.SUCCESS.name(), amount, amount, pluginProperties, 1);
 
-        // The payment was already completed
+        // The payment was already completed, it should succeed (no-op)
         final PaymentTransaction completeTransactionByPaymentId = new PaymentTransaction();
         completeTransactionByPaymentId.setPaymentId(initialPayment.getPaymentId());
-        try {
-            killBillClient.completePayment(completeTransactionByPaymentId, pluginProperties, basicRequestOptions());
-            fail("Completion should not succeed, there is no PENDING payment transaction");
-        } catch (final KillBillClientException expected) {
-            // Invalid parameter paymentId: XXXX
-        }
+        killBillClient.completePayment(completeTransactionByPaymentId, pluginProperties, basicRequestOptions());
     }
 
 

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPaymentPluginProperties.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPaymentPluginProperties.java
index 83f656e..e24c9a9 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPaymentPluginProperties.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPaymentPluginProperties.java
@@ -152,16 +152,6 @@ public class TestPaymentPluginProperties extends TestJaxrsBase {
         mockPaymentControlProviderPlugin.clearExpectPluginProperties();
     }
 
-    private void addProperty(final String key, final String value, final Map<String, String> dest, final List<org.killbill.billing.payment.api.PluginProperty> expectProperties) {
-        dest.put(key, value);
-        expectProperties.add(new org.killbill.billing.payment.api.PluginProperty(key, value, false));
-    }
-
-    private void addProperty(final String key, final String value, List<PluginProperty> bodyProperties, final List<org.killbill.billing.payment.api.PluginProperty> expectProperties) {
-        bodyProperties.add(new PluginProperty(key, value, false));
-        expectProperties.add(new org.killbill.billing.payment.api.PluginProperty(key, value, false));
-    }
-
     @Test(groups = "slow")
     public void testWithQueryPropertiesOnly() throws Exception {
         final List<org.killbill.billing.payment.api.PluginProperty> expectProperties = new ArrayList<org.killbill.billing.payment.api.PluginProperty>();
@@ -211,8 +201,7 @@ public class TestPaymentPluginProperties extends TestJaxrsBase {
         testInternal(queryProperties, bodyProperties, expectProperties);
     }
 
-    @Test(groups = "slow")
-    public void testInternal(final Map<String, String> queryProperties, final List<PluginProperty> bodyProperties, final List<org.killbill.billing.payment.api.PluginProperty> expectProperties) throws Exception {
+    private void testInternal(final Map<String, String> queryProperties, final List<PluginProperty> bodyProperties, final List<org.killbill.billing.payment.api.PluginProperty> expectProperties) throws Exception {
         final Account account = createAccountWithDefaultPaymentMethod();
         final UUID paymentMethodId = account.getPaymentMethodId();
         final BigDecimal amount = BigDecimal.TEN;
@@ -259,4 +248,14 @@ public class TestPaymentPluginProperties extends TestJaxrsBase {
         final Payment payment = killBillClient.createPayment(account.getAccountId(), paymentMethodId, authTransaction, pluginProperties, basicRequestOptions());
         return payment;
     }
-}
+
+    private void addProperty(final String key, final String value, final Map<String, String> dest, final List<org.killbill.billing.payment.api.PluginProperty> expectProperties) {
+        dest.put(key, value);
+        expectProperties.add(new org.killbill.billing.payment.api.PluginProperty(key, value, false));
+    }
+
+    private void addProperty(final String key, final String value, List<PluginProperty> bodyProperties, final List<org.killbill.billing.payment.api.PluginProperty> expectProperties) {
+        bodyProperties.add(new PluginProperty(key, value, false));
+        expectProperties.add(new org.killbill.billing.payment.api.PluginProperty(key, value, false));
+    }
+}
\ No newline at end of file