killbill-aplcache

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 ce48bda..63097d4 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
@@ -192,9 +192,9 @@ public abstract class KillbillClient extends GuicyKillbillTestSuiteWithEmbeddedD
         final PaymentMethodPluginDetail info = new PaymentMethodPluginDetail();
         final PaymentMethod paymentMethodJson = new PaymentMethod(null, UUIDs.randomUUID().toString(), input.getAccountId(),
                                                                   isDefault, ExternalPaymentProviderPlugin.PLUGIN_NAME, info, EMPTY_AUDIT_LOGS);
+        final PaymentMethod paymentMethod = accountApi.createPaymentMethod(input.getAccountId(), paymentMethodJson, isDefault, false, NULL_PLUGIN_NAMES, NULL_PLUGIN_PROPERTIES, requestOptions);
         callbackServlet.assertListenerStatus();
-
-        return accountApi.createPaymentMethod(input.getAccountId(), paymentMethodJson, NULL_PLUGIN_NAMES, NULL_PLUGIN_PROPERTIES, requestOptions);
+        return paymentMethod;
     }
 
     protected Account createAccount() throws Exception {

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java
index b82d14b..9ecd021 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java
@@ -76,7 +76,7 @@ public class TestAdmin extends TestJaxrsBase {
         final Payment updatedPayment = paymentApi.getPayment(authPayment.getPaymentId(), NULL_PLUGIN_PROPERTIES, requestOptions);
         Assert.assertEquals(updatedPayment.getTransactions().size(), 1);
         final PaymentTransaction authTransaction2 = updatedPayment.getTransactions().get(0);
-        Assert.assertEquals(authTransaction2.getStatus(), TransactionStatus.PAYMENT_FAILURE.toString());
+        Assert.assertEquals(authTransaction2.getStatus(), TransactionStatus.PAYMENT_FAILURE);
 
         // Capture should fail because lastSuccessPaymentState was moved to AUTH_FAILED
         doCapture(updatedPayment, true);

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
index a7cabe3..e348d56 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestJaxrsBase.java
@@ -214,6 +214,11 @@ public class TestJaxrsBase extends KillbillClient {
     }
 
     protected void setupClient(final String username, final String password, final String apiKey, final String apiSecret) {
+        requestOptions = requestOptions.extend()
+                                       .withTenantApiKey(apiKey)
+                                       .withTenantApiSecret(apiSecret)
+                                       .build();
+
         killBillHttpClient = new KillBillHttpClient(String.format("http://%s:%d", config.getServerHost(), config.getServerPort()),
                                                     username,
                                                     password,
@@ -257,10 +262,6 @@ public class TestJaxrsBase extends KillbillClient {
         setupClient(USERNAME, PASSWORD, null, null);
     }
 
-    protected void login() {
-        login(USERNAME, PASSWORD);
-    }
-
     protected void login(final String username, final String password) {
         setupClient(username, password, DEFAULT_API_KEY, DEFAULT_API_SECRET);
     }
@@ -317,7 +318,7 @@ public class TestJaxrsBase extends KillbillClient {
             callbackServlet.pushExpectedEvent(ExtBusEventType.TENANT_CONFIG_CHANGE);
         }
 
-        final Tenant createdTenant = tenantApi.createTenant(tenant, true, requestOptions);
+        final Tenant createdTenant = tenantApi.createTenant(tenant, useGlobalDefault, requestOptions);
 
         // Register tenant for callback
         final String callback = callbackServer.getServletEndpoint();