diff --git a/util/src/test/java/org/killbill/billing/DBTestingHelper.java b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
index 46a0907..de0640b 100644
--- a/util/src/test/java/org/killbill/billing/DBTestingHelper.java
+++ b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
@@ -112,7 +112,7 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
"CREATE TABLE tenants (\n" +
" record_id serial unique,\n" +
" id varchar(36) NOT NULL,\n" +
- " external_key varchar(128) NULL,\n" +
+ " external_key varchar(255) NULL,\n" +
" api_key varchar(128) NULL,\n" +
" api_secret varchar(128) NULL,\n" +
" api_salt varchar(128) NULL,\n" +
@@ -128,9 +128,10 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
"CREATE TABLE bundles (\n" +
" record_id serial unique,\n" +
" id varchar(36) NOT NULL,\n" +
- " external_key varchar(64) NOT NULL,\n" +
+ " external_key varchar(255) NOT NULL,\n" +
" account_id varchar(36) NOT NULL,\n" +
" last_sys_update_date datetime,\n" +
+ " original_created_date datetime NOT NULL,\n" +
" created_by varchar(50) NOT NULL,\n" +
" created_date datetime NOT NULL,\n" +
" updated_by varchar(50) NOT NULL,\n" +
@@ -147,9 +148,8 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
" category varchar(32) NOT NULL,\n" +
" start_date datetime NOT NULL,\n" +
" bundle_start_date datetime NOT NULL,\n" +
- " active_version int DEFAULT 1,\n" +
" charged_through_date datetime DEFAULT NULL,\n" +
- " paid_through_date datetime DEFAULT NULL,\n" +
+ " migrated bool NOT NULL default FALSE,\n" +
" created_by varchar(50) NOT NULL,\n" +
" created_date datetime NOT NULL,\n" +
" updated_by varchar(50) NOT NULL,\n" +
@@ -165,12 +165,10 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
" record_id serial unique,\n" +
" id varchar(36) NOT NULL,\n" +
" account_id varchar(36) NOT NULL,\n" +
- " invoice_id varchar(36) NOT NULL,\n" +
" payment_method_id varchar(36) NOT NULL,\n" +
- " amount numeric(15,9),\n" +
- " currency varchar(3),\n" +
- " effective_date datetime,\n" +
- " payment_status varchar(50),\n" +
+ " external_key varchar(255) NOT NULL,\n" +
+ " state_name varchar(64) DEFAULT NULL,\n" +
+ " last_success_state_name varchar(64) DEFAULT NULL,\n" +
" created_by varchar(50) NOT NULL,\n" +
" created_date datetime NOT NULL,\n" +
" updated_by varchar(50) NOT NULL,\n" +
diff --git a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
index f3654cd..c13db83 100644
--- a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
+++ b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
@@ -53,9 +53,11 @@ public class TestInternalCallContextFactory extends UtilTestSuiteWithEmbeddedDB
" id varchar(36) NOT NULL,\n" +
" account_id varchar(36) NOT NULL,\n" +
" invoice_date date NOT NULL,\n" +
- " target_date date NOT NULL,\n" +
+ " target_date date,\n" +
" currency varchar(3) NOT NULL,\n" +
+ " status varchar(15) NOT NULL DEFAULT 'COMMITTED',\n" +
" migrated bool NOT NULL,\n" +
+ " parent_invoice bool NOT NULL DEFAULT FALSE,\n" +
" created_by varchar(50) NOT NULL,\n" +
" created_date datetime NOT NULL,\n" +
" account_record_id bigint /*! unsigned */ not null,\n" +
