killbill-memoizeit

diff --git a/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java b/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
index 4b6027e..8a4fd1f 100644
--- a/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
+++ b/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
@@ -16,6 +16,7 @@
 
 package com.ning.billing.account.api;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -34,8 +35,9 @@ public class MockAccountUserApi implements AccountUserApi {
                                  String phone,
                                  Currency currency,
                                  int billCycleDay,
-                                 String paymentProviderName) {
-        Account result = new DefaultAccount(id, externalKey, email, name, firstNameLength, phone, currency, billCycleDay, paymentProviderName);
+                                 String paymentProviderName,
+                                 BigDecimal balance) {
+        Account result = new DefaultAccount(id, externalKey, email, name, firstNameLength, phone, currency, billCycleDay, paymentProviderName, balance);
         accounts.add(result);
         return result;
     }
@@ -76,4 +78,14 @@ public class MockAccountUserApi implements AccountUserApi {
     public void saveAccount(Account account) {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public UUID getIdFromKey(String externalKey) {
+        for (Account account : accounts) {
+            if (externalKey.equals(account.getExternalKey())) {
+                return account.getId();
+            }
+        }
+        return null;
+    }
 }

diff --git a/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java b/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java
index a3cc82d..6f42ec8 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java
@@ -22,6 +22,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.joda.time.DateTime;
+
 import com.ning.billing.catalog.api.Currency;
 
 public class MockInvoicePaymentApi implements InvoicePaymentApi
@@ -33,7 +35,7 @@ public class MockInvoicePaymentApi implements InvoicePaymentApi
     }
 
     @Override
-    public void paymentSuccessful(UUID invoiceId, BigDecimal amount, Currency currency, UUID paymentId) {
+    public void paymentSuccessful(UUID invoiceId, BigDecimal amount, Currency currency, UUID paymentId, DateTime paymentAttemptDate) {
         throw new UnsupportedOperationException();
     }
 
@@ -58,4 +60,9 @@ public class MockInvoicePaymentApi implements InvoicePaymentApi
         }
         return null;
     }
+
+    @Override
+    public void paymentFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate) {
+        throw new UnsupportedOperationException();
+    }
 }

diff --git a/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java b/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
index 9afc1ae..9be2dc1 100644
--- a/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
+++ b/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
@@ -79,7 +79,7 @@ public class TestPaymentProvider {
     protected Account createAccount() {
         String name = "First" + RandomStringUtils.random(5) + " " + "Last" + RandomStringUtils.random(5);
         String externalKey = "12345";
-        return accountUserApi.createAccount(UUID.randomUUID(), externalKey, "user@example.com", name, name.length(), "123-456-7890", Currency.USD, 1, null);
+        return accountUserApi.createAccount(UUID.randomUUID(), externalKey, "user@example.com", name, name.length(), "123-456-7890", Currency.USD, 1, null, BigDecimal.ZERO);
     }
 
     protected Invoice createInvoice(Account account,