killbill-memoizeit

diff --git a/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java b/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java
index 47f0211..a2c6f65 100644
--- a/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java
+++ b/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java
@@ -188,10 +188,37 @@ public class MysqlTestingHelper {
 
     public void initDb() throws IOException {
         // We always want the accounts and tenants table
-        initDb("drop table if exists accounts; create table accounts(record_id int(11) unsigned not null auto_increment, id char(36) not null, " +
-               "email varchar(128) not null, name varchar(100) not null, first_name_length int not null, is_notified_for_invoices boolean not null, " +
-               "created_date datetime NOT NULL, created_by varchar(50) NOT NULL, updated_date datetime NOT NULL, updated_by varchar(50) NULL, " +
-               "tenant_record_id int(11) unsigned default 0, primary key(record_id)) engine=innodb;");
+        initDb("drop table if exists accounts;" +
+               "CREATE TABLE accounts (\n" +
+               "    record_id int(11) unsigned NOT NULL AUTO_INCREMENT,\n" +
+               "    id char(36) NOT NULL,\n" +
+               "    external_key varchar(128) NULL,\n" +
+               "    email varchar(128) NOT NULL,\n" +
+               "    name varchar(100) NOT NULL,\n" +
+               "    first_name_length int NOT NULL,\n" +
+               "    currency char(3) DEFAULT NULL,\n" +
+               "    billing_cycle_day_local int DEFAULT NULL,\n" +
+               "    billing_cycle_day_utc int DEFAULT NULL,\n" +
+               "    payment_method_id char(36) DEFAULT NULL,\n" +
+               "    time_zone varchar(50) DEFAULT NULL,\n" +
+               "    locale varchar(5) DEFAULT NULL,\n" +
+               "    address1 varchar(100) DEFAULT NULL,\n" +
+               "    address2 varchar(100) DEFAULT NULL,\n" +
+               "    company_name varchar(50) DEFAULT NULL,\n" +
+               "    city varchar(50) DEFAULT NULL,\n" +
+               "    state_or_province varchar(50) DEFAULT NULL,\n" +
+               "    country varchar(50) DEFAULT NULL,\n" +
+               "    postal_code varchar(16) DEFAULT NULL,\n" +
+               "    phone varchar(25) DEFAULT NULL,\n" +
+               "    migrated bool DEFAULT false,\n" +
+               "    is_notified_for_invoices boolean NOT NULL,\n" +
+               "    created_date datetime NOT NULL,\n" +
+               "    created_by varchar(50) NOT NULL,\n" +
+               "    updated_date datetime DEFAULT NULL,\n" +
+               "    updated_by varchar(50) DEFAULT NULL,\n" +
+               "    tenant_record_id int(11) unsigned default null,\n" +
+               "    PRIMARY KEY(record_id)\n" +
+               ") ENGINE=innodb;");
         initDb("drop table if exists tenants; create table tenants(record_id int(11) unsigned not null auto_increment, id char(36) not null, primary key(record_id)) engine=innodb;");
 
         // We always want the basic tables when we do account_record_id lookups (e.g. for custom fields, tags or junction)

diff --git a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
index 9b409d8..264282d 100644
--- a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
@@ -27,6 +27,7 @@ import org.testng.annotations.BeforeSuite;
 import com.ning.billing.dbi.MysqlTestingHelper;
 
 public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
+
     protected static final MysqlTestingHelper helper = new MysqlTestingHelper();
 
     public static MysqlTestingHelper getMysqlTestingHelper() {

diff --git a/util/src/test/java/com/ning/billing/util/export/dao/TestDatabaseExportDao.java b/util/src/test/java/com/ning/billing/util/export/dao/TestDatabaseExportDao.java
index b39f204..db9465e 100644
--- a/util/src/test/java/com/ning/billing/util/export/dao/TestDatabaseExportDao.java
+++ b/util/src/test/java/com/ning/billing/util/export/dao/TestDatabaseExportDao.java
@@ -87,8 +87,8 @@ public class TestDatabaseExportDao extends UtilTestSuiteWithEmbeddedDB {
         // Verify new dump
         final String newDump = getDump();
         // Note: unclear why Jackson would quote the header?
-        Assert.assertEquals(newDump, "-- accounts record_id,id,email,name,first_name_length,\"is_notified_for_invoices\",created_date,created_by,updated_date,updated_by,tenant_record_id" + "\n" +
-                                     String.format("%s,\"%s\",%s,%s,%s,%s,\"%s\",%s,\"%s\",%s,%s", internalCallContext.getAccountRecordId(), accountId, accountEmail, accountName, firstNameLength,
+        Assert.assertEquals(newDump, "-- accounts record_id,id,external_key,email,name,first_name_length,currency,\"billing_cycle_day_local\",\"billing_cycle_day_utc\",payment_method_id,time_zone,locale,address1,address2,company_name,city,state_or_province,country,postal_code,phone,migrated,\"is_notified_for_invoices\",created_date,created_by,updated_date,updated_by,tenant_record_id\n" +
+                                     String.format("%s,\"%s\",,%s,%s,%s,,,,,,,,,,,,,,,false,%s,\"%s\",%s,\"%s\",%s,%s", internalCallContext.getAccountRecordId(), accountId, accountEmail, accountName, firstNameLength,
                                                    isNotifiedForInvoices, "1970-05-24T18:33:02.000+0000", createdBy, "1982-02-18T20:03:42.000+0000", updatedBy, internalCallContext.getTenantRecordId()) + "\n" +
                                      "-- " + tableNameA + " record_id,a_column,account_record_id,tenant_record_id\n" +
                                      "1,a," + internalCallContext.getAccountRecordId() + "," + internalCallContext.getTenantRecordId() + "\n" +