killbill-memoizeit

diff --git a/account/pom.xml b/account/pom.xml
index 2107a34..c7fdf58 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-util</artifactId>
-            <type>test-jar</type>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/analytics/pom.xml b/analytics/pom.xml
index 03e7d72..32ddd98 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-util</artifactId>
-            <type>test-jar</type>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 5c5f921..b77bed4 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-util</artifactId>
-            <type>test-jar</type>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/invoice/pom.xml b/invoice/pom.xml
index 3d7dc27..14c456d 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-util</artifactId>
-            <type>test-jar</type>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/payment/pom.xml b/payment/pom.xml
index 409851b..9074d05 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
@@ -81,6 +86,12 @@
         </dependency>
         <dependency>
             <groupId>com.ning.billing</groupId>
+            <artifactId>killbill-util</artifactId>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ning.billing</groupId>
             <artifactId>killbill-account</artifactId>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -91,5 +102,15 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+             <groupId>com.mysql</groupId>
+             <artifactId>management</artifactId>
+             <scope>test</scope>
+         </dependency>
+         <dependency>
+             <groupId>com.mysql</groupId>
+             <artifactId>management-dbfiles</artifactId>
+             <scope>test</scope>
+         </dependency>
     </dependencies>
 </project>

diff --git a/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
index 5f9900f..a02dfed 100644
--- a/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
+++ b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
@@ -66,11 +66,11 @@ public class MockPaymentProviderPlugin implements PaymentProviderPlugin {
     }
 
     @Override
-    public Either<PaymentError, PaymentProviderAccount> createPaymentProviderAccount(Account account) {
+    public Either<PaymentError, PaymentProviderAccount> createPaymentProviderAccount(PaymentProviderAccount account) {
         if (account != null) {
-            PaymentProviderAccount paymentProviderAccount = accounts.put(account.getExternalKey(),
-                                                                         new PaymentProviderAccount.Builder().setAccountName(account.getExternalKey())
-                                                                                                             .setAccountNumber(account.getExternalKey())
+            PaymentProviderAccount paymentProviderAccount = accounts.put(account.getAccountName(),
+                                                                         new PaymentProviderAccount.Builder().setAccountName(account.getAccountName())
+                                                                                                             .setAccountNumber(account.getAccountName())
                                                                                                              .setId(account.getId().toString())
                                                                                                              .build());
 

diff --git a/pom.xml b/pom.xml
index 20dcd7c..0d6eaa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,7 @@
                 <groupId>com.ning.billing</groupId>
                 <artifactId>killbill-util</artifactId>
                 <version>${project.version}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
+                <classifier>tests</classifier>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>