diff --git a/build.gradle b/build.gradle
index 3f825c9121..6b82dbe339 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,7 +101,7 @@ if (project.findProject(":remoteapi:labkey-api-jdbc") != null)
 
 if (project.hasProperty("teamcity"))
 {
-    apply plugin: 'org.labkey.teamCity'
+    apply plugin: 'org.labkey.build.teamCity'
 }
 
 // If this configuration for the default jar file is included when syncing with IntelliJ
diff --git a/buildTestModules/communityArtifacts/build.gradle b/buildTestModules/communityArtifacts/build.gradle
index 39f07374ae..fe46d39f7c 100644
--- a/buildTestModules/communityArtifacts/build.gradle
+++ b/buildTestModules/communityArtifacts/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'org.labkey.module'
+apply plugin: 'org.labkey.build.module'
 
 dependencies { 
     // add dependencies on community modules, not including those that come through from transitive dependencies:
diff --git a/buildTestModules/starterArtifacts/build.gradle b/buildTestModules/starterArtifacts/build.gradle
index fafa8d2e0f..df0b276b14 100644
--- a/buildTestModules/starterArtifacts/build.gradle
+++ b/buildTestModules/starterArtifacts/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'org.labkey.module'
+apply plugin: 'org.labkey.build.module'
 
 dependencies { 
     // add dependencies on starter modules, not including those that come through from transitive dependencies:
diff --git a/distributions/teamcity/build.gradle b/distributions/teamcity/build.gradle
index 669dc2ef2c..edd23a6b03 100644
--- a/distributions/teamcity/build.gradle
+++ b/distributions/teamcity/build.gradle
@@ -62,9 +62,9 @@ else
             if (otherProject != project && ModuleFinder.isPotentialModule(otherProject) && FileModule.shouldDoBuild(otherProject, false))
             {
                 project.evaluationDependsOn(otherProject.path)
-                if (otherProject.plugins.hasPlugin('org.labkey.module') ||
-                    otherProject.plugins.hasPlugin('org.labkey.fileModule') ||
-                    otherProject.plugins.hasPlugin('org.labkey.javaModule'))
+                if (otherProject.plugins.hasPlugin('org.labkey.build.module') ||
+                    otherProject.plugins.hasPlugin('org.labkey.build.fileModule') ||
+                    otherProject.plugins.hasPlugin('org.labkey.build.javaModule'))
                     pathList += otherProject.path
             }
     }
diff --git a/modules/build.gradle b/modules/build.gradle
index 72b0f031f9..0035273b52 100644
--- a/modules/build.gradle
+++ b/modules/build.gradle
@@ -3,9 +3,9 @@ subprojects { Project p ->
     if (p.getProjectDir().exists())
     {
         if (p.file("src").exists())
-            apply plugin: 'org.labkey.module'
+            apply plugin: 'org.labkey.build.module'
         else
-            apply plugin: 'org.labkey.fileModule'
+            apply plugin: 'org.labkey.build.fileModule'
     }
 }
 
diff --git a/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-0.000-22.000.sql b/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-0.000-22.000.sql
deleted file mode 100644
index 1de28c647c..0000000000
--- a/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-0.000-22.000.sql
+++ /dev/null
@@ -1,866 +0,0 @@
-/*
- * Copyright (c) 2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* vehicle-0.00-1.00.sql */
-
-CREATE SCHEMA vehicle;
-
-CREATE TABLE vehicle.Colors
-(
-    Name VARCHAR(30) NOT NULL,
-    Hex TEXT,
-
-    CONSTRAINT PK_Colors PRIMARY KEY (Name)
-);
-
-CREATE TABLE vehicle.Manufacturers
-(
-    RowId SERIAL NOT NULL,
-    Name VARCHAR(255) NOT NULL,
-
-    CONSTRAINT PK_Manufacturers PRIMARY KEY (RowId)
-);
-
-CREATE TABLE vehicle.Models
-(
-    RowId SERIAL NOT NULL,
-    ManufacturerId INT NOT NULL,
-    Name VARCHAR(255) NOT NULL,
-
-    CONSTRAINT PK_Models PRIMARY KEY (RowId),
-    CONSTRAINT FK_Models_Manufacturers FOREIGN KEY (ManufacturerId) REFERENCES vehicle.Manufacturers(RowId)
-);
-
-CREATE TABLE vehicle.Vehicles
-(
-    RowId SERIAL NOT NULL,
-    Container ENTITYID NOT NULL,
-    CreatedBy USERID NOT NULL,
-    Created TIMESTAMP NOT NULL,
-    ModifiedBy USERID NOT NULL,
-    Modified TIMESTAMP NOT NULL,
-
-    ModelId INT NOT NULL,
-    Color VARCHAR(30) NOT NULL,
-
-    ModelYear INT NOT NULL,
-    Milage INT NOT NULL,
-    LastService TIMESTAMP NOT NULL,
-
-    CONSTRAINT PK_Vehicles PRIMARY KEY (RowId),
-    CONSTRAINT FK_Vehicles_Models FOREIGN KEY (ModelId) REFERENCES vehicle.Models(RowId),
-    CONSTRAINT FK_Vehicles_Colors FOREIGN KEY (Color) REFERENCES vehicle.Colors(Name)
-);
-
-/* vehicle-11.30-12.10.sql */
-
--- add container constraint
-ALTER TABLE vehicle.Vehicles
-    ADD CONSTRAINT FK_Vehicles_Container FOREIGN KEY (Container) REFERENCES core.Containers (EntityId);
-
-/* vehicle-12.30-13.10.sql */
-
-CREATE TABLE vehicle.emissiontest (
-  rowid SERIAL,
-  name varchar(100),
-  container entityid,
-  parentTest int,
-  vehicleId int,
-  result boolean,
-
-  CONSTRAINT PK_emissiontest PRIMARY KEY (rowid),
-  CONSTRAINT FK_emissiontest_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-/* vehicle-13.10-13.20.sql */
-
-CREATE TABLE vehicle.etl_source
-(
-  rowid SERIAL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  TransformRun INT,
-  rowversion SERIAL,
-
-  CONSTRAINT PK_etlsource PRIMARY KEY (rowid),
-  CONSTRAINT AK_etlsource UNIQUE (container,id),
-  CONSTRAINT FK_etlsource_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-
-CREATE TABLE vehicle.etl_target
-(
-  rowid SERIAL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget UNIQUE (container,id),
-  CONSTRAINT FK_etltarget_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-CREATE TABLE vehicle.etl_target2
-(
-  rowid INT NOT NULL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget2 PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget2 UNIQUE (container,id),
-  CONSTRAINT FK_etltarget2_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-CREATE TABLE vehicle.Owner
-(
-  RowId SERIAL,
-  container ENTITYID,
-  created TIMESTAMP,
-  createdby USERID,
-  modified TIMESTAMP,
-  modifiedby USERID,
-
-  first_name VARCHAR(100),
-  last_name VARCHAR(100),
-  email VARCHAR(100),
-  gender VARCHAR(10),
-  race VARCHAR(100),
-  city VARCHAR(100),
-  state VARCHAR(100),
-  zip VARCHAR(10),
-  text VARCHAR(1000),
-  birth_date TIMESTAMP,
-  CONSTRAINT PK_owner PRIMARY KEY (container,rowid)
-);
-
-CREATE TABLE vehicle.OwnerBackup
-(
-  RowId SERIAL,
-  container ENTITYID,
-  created TIMESTAMP,
-  createdby USERID,
-  modified TIMESTAMP,
-  modifiedby USERID,
-
-  first_name VARCHAR(100),
-  last_name VARCHAR(100),
-  email VARCHAR(100),
-  gender VARCHAR(10),
-  race VARCHAR(100),
-  city VARCHAR(100),
-  state VARCHAR(100),
-  zip VARCHAR(10),
-  text VARCHAR(1000),
-  birth_date TIMESTAMP,
-  diTransformRunId INT,
-
-  CONSTRAINT PK_ownerbackup PRIMARY KEY (container,rowid)
-);
-
-/* vehicle-13.20-13.30.sql */
-
-CREATE TABLE vehicle.transfer
-(
-    RowId Int NOT NULL,
-    TransferStart TIMESTAMP NOT NULL,
-    TransferComplete TIMESTAMP NULL,
-    SchemaName VARCHAR(100),
-    Description VARCHAR(1000) NULL,
-    Log VARCHAR,
-    status VARCHAR(10) NULL,
-    container ENTITYID NULL
-);
-
-/* vehicle-13.30-14.10.sql */
-
-ALTER TABLE vehicle.Transfer ADD CONSTRAINT FK_etltransfer_container FOREIGN KEY (container) REFERENCES core.Containers (EntityId);
-ALTER TABLE vehicle.transfer ADD CONSTRAINT PK_transfer PRIMARY KEY (rowid);
-
--- It is intentional that there are no procedures in this script corresponding to the SQL Server version.
--- Stored Proc ETL's are not yet supported in Postgres and the test is skipped.
-
-CREATE OR REPLACE FUNCTION vehicle.etlMissingTransformRunId()
-RETURNS RECORD
-AS
-$BODY$
-BEGIN
-	SELECT 1;
-END;
-$BODY$ LANGUAGE plpgsql;
-
-/* vehicle-15.00-15.01.sql */
-
-CREATE OR REPLACE FUNCTION vehicle.etltestresultset(transformrunid integer, containerid entityid DEFAULT NULL::character varying, debug character varying DEFAULT ''::character varying, filterrunid integer DEFAULT NULL::integer, filterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone, filterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone, previousfilterrunid integer DEFAULT (-1), previousfilterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone, previousfilterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone, testmode integer DEFAULT (-1))
-  RETURNS refcursor AS
-$BODY$
-
-DECLARE
-      ref refcursor;                                                     -- Declare a cursor variable
-    BEGIN
-      OPEN ref FOR SELECT * FROM vehicle.etl_source where container = containerid;   -- Open a cursor
-      RETURN ref;                                                       -- Return the cursor to the caller
-    END;
-
-$BODY$
-  LANGUAGE plpgsql VOLATILE
-  COST 100;
-
-/* vehicle-15.10-15.11.sql */
-
-CREATE TABLE vehicle.etl_delete
-(
-  RowId SERIAL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  TransformRun INT,
-  rowversion SERIAL,
-  CONSTRAINT PK_etldelete PRIMARY KEY (rowid),
-  CONSTRAINT AK_etldelete UNIQUE (container,id),
-  CONSTRAINT FK_etldelete_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-/* vehicle-15.20-15.21.sql */
-
-CREATE OR REPLACE FUNCTION vehicle.etltest
-(IN transformrunid integer
-, IN containerid entityid DEFAULT NULL::character varying
-, INOUT rowsinserted integer DEFAULT 0
-, INOUT rowsdeleted integer DEFAULT 0
-, INOUT rowsmodified integer DEFAULT 0
-, INOUT returnmsg character varying DEFAULT 'default message'::character varying
-, IN debug character varying DEFAULT ''::character varying
-, IN filterrunid integer DEFAULT NULL::integer
-, INOUT filterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone
-, INOUT filterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone
-, INOUT previousfilterrunid integer DEFAULT (-1)
-, INOUT previousfilterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone
-, INOUT previousfilterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone
---, INOUT procVersion decimal DEFAULT 0
-, IN testmode integer DEFAULT (-1)
-, INOUT testinoutparam character varying DEFAULT ''::character varying
-, INOUT runcount integer DEFAULT 1
-, OUT return_status integer)
-  RETURNS record AS
-$BODY$
-
-/*
-	Test modes
-	1	normal operation
-	2	return code > 0
-	3	raise error
-	4	input/output parameter persistence
-	5	override of persisted input/output parameter
-	6	Run filter strategy, require filterRunId. Test persistence.
-  7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp,
-		populated from output of previous run
-  8	Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp
-		populated from the filter strategy IncrementalStartTime & IncrementalEndTime
-
-*/
-BEGIN
-
-IF testMode IS NULL
-THEN
-  returnMsg := 'No testMode set';
-  return_status := 1;
-  RETURN;
-END IF;
-
-IF runCount IS NULL
-THEN
-	runCount := 1;
-ELSE
-	runCount := runCount + 1;
-END IF;
-
-IF testMode = 1
-THEN
-	RAISE NOTICE '%', 'Test print statement logging';
-	rowsInserted := 1;
-	rowsDeleted := 2;
-	rowsModified := 4;
-	returnMsg := 'Test returnMsg logging';
-	return_status := 0;
-	RETURN;
-END IF;
-
-IF testMode = 2 THEN return_status := 1; RETURN; END IF;
-
-IF testMode = 3
-THEN
-	returnMsg := 'Intentional SQL Exception From Inside Proc';
-	RAISE EXCEPTION '%', returnMsg;
-END IF;
-
-IF testMode = 4 AND testInOutParam != 'after' AND runCount > 1
-THEN
-	returnMsg := 'Expected value "after" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam;
-	return_status := 1;
-	RETURN;
-END IF;
-
-IF testMode = 5 AND testInOutParam != 'before' AND runCount > 1
-THEN
-	returnMsg := 'Expected value "before" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam;
-	return_status := 1;
-	RETURN;
-END IF;
-
-IF testMode = 6
-THEN
-	IF filterRunId IS NULL
-	THEN
-		returnMsg := 'Required filterRunId value not supplied';
-		return_status := 1;
-		RETURN;
-	END IF;
-	IF runCount > 1 AND (previousFilterRunId IS NULL OR previousFilterRunId >= filterRunId)
-	THEN
-		returnMsg := 'Required filterRunId was not persisted from previous run.';
-		return_status := 1;
-		RETURN;
-	END IF;
-	previousFilterRunId := filterRunId;
-END IF;
-
-IF testMode = 7
-THEN
-	IF runCount > 1 AND (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL)
-	THEN
-		returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.';
-		return_status := 1;
-		RETURN;
-	END IF;
-	filterStartTimeStamp := localtimestamp;
-	filterEndTimeStamp := localtimestamp;
-END IF;
-
-IF testMode = 8
-THEN
-	IF runCount > 1 AND ((previousFilterStartTimeStamp IS NULL AND previousFilterEndTimeStamp IS NULL)
-							OR (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL))
-	THEN
-		returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.';
-		return_status := 1;
-		RETURN;
-	END IF;
-	previousFilterStartTimeStamp := coalesce(filterStartTimeStamp, localtimestamp);
-	previousFilterEndTimeStamp := coalesce(filterEndTimeStamp, localtimestamp);
-END IF;
-
-
--- set value for persistence tests
-IF testInOutParam != ''
-THEN
-	testInOutParam := 'after';
-END IF;
-
-return_status := 0;
-RETURN;
-
-END;
-$BODY$
-  LANGUAGE plpgsql;
-
-/* vehicle-16.20-16.30.sql */
-
--- For testing merge, need to not have a sequence set on rowid PK
-ALTER TABLE vehicle.etl_target ALTER COLUMN rowid DROP DEFAULT;
-DROP SEQUENCE vehicle.etl_target_rowid_seq;
-
-CREATE TABLE vehicle.etl_180column_source(
-  rowid SERIAL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-  field5 INT NULL,
-  field6 INT NULL,
-  field7 INT NULL,
-  field8 INT NULL,
-  field9 INT NULL,
-  field10 INT NULL,
-  field11 INT NULL,
-  field12 INT NULL,
-  field13 INT NULL,
-  field14 INT NULL,
-  field15 INT NULL,
-  field16 INT NULL,
-  field17 INT NULL,
-  field18 INT NULL,
-  field19 INT NULL,
-  field20 INT NULL,
-  field21 INT NULL,
-  field22 INT NULL,
-  field23 INT NULL,
-  field24 INT NULL,
-  field25 INT NULL,
-  field26 INT NULL,
-  field27 INT NULL,
-  field28 INT NULL,
-  field29 INT NULL,
-  field30 INT NULL,
-  field31 INT NULL,
-  field32 INT NULL,
-  field33 INT NULL,
-  field34 INT NULL,
-  field35 INT NULL,
-  field36 INT NULL,
-  field37 INT NULL,
-  field38 INT NULL,
-  field39 INT NULL,
-  field40 INT NULL,
-  field41 INT NULL,
-  field42 INT NULL,
-  field43 INT NULL,
-  field44 INT NULL,
-  field45 INT NULL,
-  field46 INT NULL,
-  field47 INT NULL,
-  field48 INT NULL,
-  field49 INT NULL,
-  field50 INT NULL,
-  field51 INT NULL,
-  field52 INT NULL,
-  field53 INT NULL,
-  field54 INT NULL,
-  field55 INT NULL,
-  field56 INT NULL,
-  field57 INT NULL,
-  field58 INT NULL,
-  field59 INT NULL,
-  field60 INT NULL,
-  field61 INT NULL,
-  field62 INT NULL,
-  field63 INT NULL,
-  field64 INT NULL,
-  field65 INT NULL,
-  field66 INT NULL,
-  field67 INT NULL,
-  field68 INT NULL,
-  field69 INT NULL,
-  field70 INT NULL,
-  field71 INT NULL,
-  field72 INT NULL,
-  field73 INT NULL,
-  field74 INT NULL,
-  field75 INT NULL,
-  field76 INT NULL,
-  field77 INT NULL,
-  field78 INT NULL,
-  field79 INT NULL,
-  field80 INT NULL,
-  field81 INT NULL,
-  field82 INT NULL,
-  field83 INT NULL,
-  field84 INT NULL,
-  field85 INT NULL,
-  field86 INT NULL,
-  field87 INT NULL,
-  field88 INT NULL,
-  field89 INT NULL,
-  field90 INT NULL,
-  field91 INT NULL,
-  field92 INT NULL,
-  field93 INT NULL,
-  field94 INT NULL,
-  field95 INT NULL,
-  field96 INT NULL,
-  field97 INT NULL,
-  field98 INT NULL,
-  field99 INT NULL,
-  field100 INT NULL,
-  field101 INT NULL,
-  field102 INT NULL,
-  field103 INT NULL,
-  field104 INT NULL,
-  field105 INT NULL,
-  field106 INT NULL,
-  field107 INT NULL,
-  field108 INT NULL,
-  field109 INT NULL,
-  field110 INT NULL,
-  field111 INT NULL,
-  field112 INT NULL,
-  field113 INT NULL,
-  field114 INT NULL,
-  field115 INT NULL,
-  field116 INT NULL,
-  field117 INT NULL,
-  field118 INT NULL,
-  field119 INT NULL,
-  field120 INT NULL,
-  field121 INT NULL,
-  field122 INT NULL,
-  field123 INT NULL,
-  field124 INT NULL,
-  field125 INT NULL,
-  field126 INT NULL,
-  field127 INT NULL,
-  field128 INT NULL,
-  field129 INT NULL,
-  field130 INT NULL,
-  field131 INT NULL,
-  field132 INT NULL,
-  field133 INT NULL,
-  field134 INT NULL,
-  field135 INT NULL,
-  field136 INT NULL,
-  field137 INT NULL,
-  field138 INT NULL,
-  field139 INT NULL,
-  field140 INT NULL,
-  field141 INT NULL,
-  field142 INT NULL,
-  field143 INT NULL,
-  field144 INT NULL,
-  field145 INT NULL,
-  field146 INT NULL,
-  field147 INT NULL,
-  field148 INT NULL,
-  field149 INT NULL,
-  field150 INT NULL,
-  field151 INT NULL,
-  field152 INT NULL,
-  field153 INT NULL,
-  field154 INT NULL,
-  field155 INT NULL,
-  field156 INT NULL,
-  field157 INT NULL,
-  field158 INT NULL,
-  field159 INT NULL,
-  field160 INT NULL,
-  field161 INT NULL,
-  field162 INT NULL,
-  field163 INT NULL,
-  field164 INT NULL,
-  field165 INT NULL,
-  field166 INT NULL,
-  field167 INT NULL,
-  field168 INT NULL,
-  field169 INT NULL,
-  field170 INT NULL,
-  field171 INT NULL,
-  field172 INT NULL,
-  field173 INT NULL,
-  field174 INT NULL,
-  field175 INT NULL,
-  field176 INT NULL,
-  field177 INT NULL,
-  field178 INT NULL,
-  field179 INT NULL,
-  field180 INT NULL,
-
-  CONSTRAINT PK_etl_180column_source PRIMARY KEY (RowId),
-  CONSTRAINT FK_etl_180column_source_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-CREATE TABLE vehicle.etl_180column_target(
-  rowid INT NOT NULL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-  field5 INT NULL,
-  field6 INT NULL,
-  field7 INT NULL,
-  field8 INT NULL,
-  field9 INT NULL,
-  field10 INT NULL,
-  field11 INT NULL,
-  field12 INT NULL,
-  field13 INT NULL,
-  field14 INT NULL,
-  field15 INT NULL,
-  field16 INT NULL,
-  field17 INT NULL,
-  field18 INT NULL,
-  field19 INT NULL,
-  field20 INT NULL,
-  field21 INT NULL,
-  field22 INT NULL,
-  field23 INT NULL,
-  field24 INT NULL,
-  field25 INT NULL,
-  field26 INT NULL,
-  field27 INT NULL,
-  field28 INT NULL,
-  field29 INT NULL,
-  field30 INT NULL,
-  field31 INT NULL,
-  field32 INT NULL,
-  field33 INT NULL,
-  field34 INT NULL,
-  field35 INT NULL,
-  field36 INT NULL,
-  field37 INT NULL,
-  field38 INT NULL,
-  field39 INT NULL,
-  field40 INT NULL,
-  field41 INT NULL,
-  field42 INT NULL,
-  field43 INT NULL,
-  field44 INT NULL,
-  field45 INT NULL,
-  field46 INT NULL,
-  field47 INT NULL,
-  field48 INT NULL,
-  field49 INT NULL,
-  field50 INT NULL,
-  field51 INT NULL,
-  field52 INT NULL,
-  field53 INT NULL,
-  field54 INT NULL,
-  field55 INT NULL,
-  field56 INT NULL,
-  field57 INT NULL,
-  field58 INT NULL,
-  field59 INT NULL,
-  field60 INT NULL,
-  field61 INT NULL,
-  field62 INT NULL,
-  field63 INT NULL,
-  field64 INT NULL,
-  field65 INT NULL,
-  field66 INT NULL,
-  field67 INT NULL,
-  field68 INT NULL,
-  field69 INT NULL,
-  field70 INT NULL,
-  field71 INT NULL,
-  field72 INT NULL,
-  field73 INT NULL,
-  field74 INT NULL,
-  field75 INT NULL,
-  field76 INT NULL,
-  field77 INT NULL,
-  field78 INT NULL,
-  field79 INT NULL,
-  field80 INT NULL,
-  field81 INT NULL,
-  field82 INT NULL,
-  field83 INT NULL,
-  field84 INT NULL,
-  field85 INT NULL,
-  field86 INT NULL,
-  field87 INT NULL,
-  field88 INT NULL,
-  field89 INT NULL,
-  field90 INT NULL,
-  field91 INT NULL,
-  field92 INT NULL,
-  field93 INT NULL,
-  field94 INT NULL,
-  field95 INT NULL,
-  field96 INT NULL,
-  field97 INT NULL,
-  field98 INT NULL,
-  field99 INT NULL,
-  field100 INT NULL,
-  field101 INT NULL,
-  field102 INT NULL,
-  field103 INT NULL,
-  field104 INT NULL,
-  field105 INT NULL,
-  field106 INT NULL,
-  field107 INT NULL,
-  field108 INT NULL,
-  field109 INT NULL,
-  field110 INT NULL,
-  field111 INT NULL,
-  field112 INT NULL,
-  field113 INT NULL,
-  field114 INT NULL,
-  field115 INT NULL,
-  field116 INT NULL,
-  field117 INT NULL,
-  field118 INT NULL,
-  field119 INT NULL,
-  field120 INT NULL,
-  field121 INT NULL,
-  field122 INT NULL,
-  field123 INT NULL,
-  field124 INT NULL,
-  field125 INT NULL,
-  field126 INT NULL,
-  field127 INT NULL,
-  field128 INT NULL,
-  field129 INT NULL,
-  field130 INT NULL,
-  field131 INT NULL,
-  field132 INT NULL,
-  field133 INT NULL,
-  field134 INT NULL,
-  field135 INT NULL,
-  field136 INT NULL,
-  field137 INT NULL,
-  field138 INT NULL,
-  field139 INT NULL,
-  field140 INT NULL,
-  field141 INT NULL,
-  field142 INT NULL,
-  field143 INT NULL,
-  field144 INT NULL,
-  field145 INT NULL,
-  field146 INT NULL,
-  field147 INT NULL,
-  field148 INT NULL,
-  field149 INT NULL,
-  field150 INT NULL,
-  field151 INT NULL,
-  field152 INT NULL,
-  field153 INT NULL,
-  field154 INT NULL,
-  field155 INT NULL,
-  field156 INT NULL,
-  field157 INT NULL,
-  field158 INT NULL,
-  field159 INT NULL,
-  field160 INT NULL,
-  field161 INT NULL,
-  field162 INT NULL,
-  field163 INT NULL,
-  field164 INT NULL,
-  field165 INT NULL,
-  field166 INT NULL,
-  field167 INT NULL,
-  field168 INT NULL,
-  field169 INT NULL,
-  field170 INT NULL,
-  field171 INT NULL,
-  field172 INT NULL,
-  field173 INT NULL,
-  field174 INT NULL,
-  field175 INT NULL,
-  field176 INT NULL,
-  field177 INT NULL,
-  field178 INT NULL,
-  field179 INT NULL,
-  field180 INT NULL,
-
-  CONSTRAINT PK_etl_180column_target PRIMARY KEY (RowId),
-  CONSTRAINT FK_etl_180column_target_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
--- Undo change to this table from the 16.20-16.21 script. Make the merge test use etl_target2 instead
-DROP TABLE vehicle.etl_target;
-CREATE TABLE vehicle.etl_target
-(
-  rowid SERIAL,
-  container entityid,
-  created TIMESTAMP,
-  modified TIMESTAMP,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget UNIQUE (container,id),
-  CONSTRAINT FK_etltarget_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-TRUNCATE TABLE vehicle.etl_target2;
-ALTER TABLE vehicle.etl_target2 DROP CONSTRAINT pk_etltarget2;
-ALTER TABLE vehicle.etl_target2 ALTER COLUMN container SET NOT NULL;
-ALTER TABLE vehicle.etl_target2 ADD CONSTRAINT pk_etltarget2 PRIMARY KEY (RowId, container);
-
-TRUNCATE TABLE vehicle.etl_180column_target;
-ALTER TABLE vehicle.etl_180column_target DROP CONSTRAINT pk_etl_180column_target;
-ALTER TABLE vehicle.etl_180column_target ALTER COLUMN container SET NOT NULL;
-ALTER TABLE vehicle.etl_180column_target ADD CONSTRAINT pk_etl_180column_target PRIMARY KEY (RowId, container);
-
-/* vehicle-16.30-17.10.sql */
-
-ALTER TABLE vehicle.Models
-    ADD InitialReleaseYear INT;
-
--- Drop tables / functions for ETL testing from this schema; they've been moved to the etltest schema.
-DROP TABLE vehicle.etl_source;
-DROP TABLE vehicle.etl_target;
-DROP TABLE vehicle.etl_target2;
-DROP TABLE vehicle.transfer;
-DROP TABLE vehicle.etl_180column_source;
-DROP TABLE vehicle.etl_180column_target;
-DROP TABLE vehicle.etl_delete;
-
-DROP FUNCTION vehicle.etltest(integer, entityid, integer, integer, integer, character varying, character varying, integer, timestamp without time zone, timestamp without time zone, integer, timestamp without time zone, timestamp without time zone, integer, character varying, integer);
-DROP FUNCTION vehicle.etltestresultset(integer, entityid, character varying, integer, timestamp without time zone, timestamp without time zone, integer, timestamp without time zone, timestamp without time zone, integer);
--- This function wasn't being used
-DROP FUNCTION vehicle.etlmissingtransformrunid();
-
--- These two tables seem to have been introduced for ETL testing, but were never used
-DROP TABLE vehicle.owner;
-DROP TABLE vehicle.ownerbackup;
-
-/* vehicle-17.10-17.20.sql */
-
-ALTER TABLE vehicle.Colors ADD TriggerScriptProperty VARCHAR(100);
-
-/* vehicle-18.20-18.30.sql */
-
-ALTER TABLE vehicle.Models ADD ThumbnailImage VARCHAR(60);
-ALTER TABLE vehicle.Models ADD Image VARCHAR(60);
-ALTER TABLE vehicle.Models ADD PopupImage VARCHAR(60);
-
-/* vehicle-19.20-19.30.sql */
-
-CREATE TABLE vehicle.FirstFKTable
-(
-    RowId INT NOT NULL,
-    StartCycleCol INT NOT NULL UNIQUE,
-    CONSTRAINT PK_FirstFKTable PRIMARY KEY (RowId)
-);
-
-CREATE TABLE vehicle.SecondFKTable
-(
-    RowId INT NOT NULL,
-    StartCycleCol INT NOT NULL UNIQUE,
-    CycleCol INT NOT NULL UNIQUE,
-
-    CONSTRAINT PK_SecondFKTable PRIMARY KEY (RowId)
-);
-
-CREATE TABLE vehicle.ThirdFKTable
-(
-    RowId INT NOT NULL,
-    CycleCol INT NOT NULL UNIQUE,
-
-    CONSTRAINT PK_ThirdFKTable PRIMARY KEY (RowId)
-);
-
-ALTER TABLE vehicle.FirstFKTable ADD CONSTRAINT FK_SecondFKTable_StartCycleCol FOREIGN KEY (StartCycleCol) REFERENCES vehicle.SecondFKTable (StartCycleCol);
-ALTER TABLE vehicle.SecondFKTable ADD CONSTRAINT FK_ThirdFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.ThirdFKTable (CycleCol);
-ALTER TABLE vehicle.ThirdFKTable ADD CONSTRAINT FK_SecondFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.SecondFKTable (CycleCol);
-
-/* 21.xxx SQL scripts */
-
-ALTER TABLE vehicle.Vehicles ADD TriggerScriptContainer ENTITYID;
\ No newline at end of file
diff --git a/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-0.000-23.000.sql b/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-0.000-23.000.sql
new file mode 100644
index 0000000000..ed6be14c1f
--- /dev/null
+++ b/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-0.000-23.000.sql
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE SCHEMA vehicle;
+
+CREATE TABLE vehicle.Colors
+(
+    Name VARCHAR(30) NOT NULL,
+    Hex TEXT,
+
+    CONSTRAINT PK_Colors PRIMARY KEY (Name)
+);
+
+ALTER TABLE vehicle.Colors ADD TriggerScriptProperty VARCHAR(100);
+
+CREATE TABLE vehicle.Manufacturers
+(
+    RowId SERIAL NOT NULL,
+    Name VARCHAR(255) NOT NULL,
+
+    CONSTRAINT PK_Manufacturers PRIMARY KEY (RowId)
+);
+
+CREATE TABLE vehicle.Models
+(
+    RowId SERIAL NOT NULL,
+    ManufacturerId INT NOT NULL,
+    Name VARCHAR(255) NOT NULL,
+
+    CONSTRAINT PK_Models PRIMARY KEY (RowId),
+    CONSTRAINT FK_Models_Manufacturers FOREIGN KEY (ManufacturerId) REFERENCES vehicle.Manufacturers(RowId)
+);
+
+ALTER TABLE vehicle.Models ADD InitialReleaseYear INT;
+ALTER TABLE vehicle.Models ADD ThumbnailImage VARCHAR(60);
+ALTER TABLE vehicle.Models ADD Image VARCHAR(60);
+ALTER TABLE vehicle.Models ADD PopupImage VARCHAR(60);
+
+CREATE TABLE vehicle.Vehicles
+(
+    RowId SERIAL NOT NULL,
+    Container ENTITYID NOT NULL,
+    CreatedBy USERID NOT NULL,
+    Created TIMESTAMP NOT NULL,
+    ModifiedBy USERID NOT NULL,
+    Modified TIMESTAMP NOT NULL,
+
+    ModelId INT NOT NULL,
+    Color VARCHAR(30) NOT NULL,
+
+    ModelYear INT NOT NULL,
+    Milage INT NOT NULL,
+    LastService TIMESTAMP NOT NULL,
+
+    CONSTRAINT PK_Vehicles PRIMARY KEY (RowId),
+    CONSTRAINT FK_Vehicles_Models FOREIGN KEY (ModelId) REFERENCES vehicle.Models(RowId),
+    CONSTRAINT FK_Vehicles_Colors FOREIGN KEY (Color) REFERENCES vehicle.Colors(Name)
+);
+
+-- add container constraint
+ALTER TABLE vehicle.Vehicles ADD CONSTRAINT FK_Vehicles_Container FOREIGN KEY (Container) REFERENCES core.Containers (EntityId);
+ALTER TABLE vehicle.Vehicles ADD TriggerScriptContainer ENTITYID;
+
+CREATE TABLE vehicle.emissiontest (
+  rowid SERIAL,
+  name varchar(100),
+  container entityid,
+  parentTest int,
+  vehicleId int,
+  result boolean,
+
+  CONSTRAINT PK_emissiontest PRIMARY KEY (rowid),
+  CONSTRAINT FK_emissiontest_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
+);
+
+CREATE TABLE vehicle.FirstFKTable
+(
+    RowId INT NOT NULL,
+    StartCycleCol INT NOT NULL UNIQUE,
+    CONSTRAINT PK_FirstFKTable PRIMARY KEY (RowId)
+);
+
+CREATE TABLE vehicle.SecondFKTable
+(
+    RowId INT NOT NULL,
+    StartCycleCol INT NOT NULL UNIQUE,
+    CycleCol INT NOT NULL UNIQUE,
+
+    CONSTRAINT PK_SecondFKTable PRIMARY KEY (RowId)
+);
+
+ALTER TABLE vehicle.FirstFKTable ADD CONSTRAINT FK_SecondFKTable_StartCycleCol FOREIGN KEY (StartCycleCol) REFERENCES vehicle.SecondFKTable (StartCycleCol);
+
+CREATE TABLE vehicle.ThirdFKTable
+(
+    RowId INT NOT NULL,
+    CycleCol INT NOT NULL UNIQUE,
+
+    CONSTRAINT PK_ThirdFKTable PRIMARY KEY (RowId)
+);
+
+ALTER TABLE vehicle.SecondFKTable ADD CONSTRAINT FK_ThirdFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.ThirdFKTable (CycleCol);
+ALTER TABLE vehicle.ThirdFKTable ADD CONSTRAINT FK_SecondFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.SecondFKTable (CycleCol);
diff --git a/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-22.001-22.002.sql b/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-22.001-22.002.sql
deleted file mode 100644
index 08f86d174f..0000000000
--- a/modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-22.001-22.002.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE vehicle.Vehicles ADD COLUMN IF NOT EXISTS TriggerScriptContainer ENTITYID;
\ No newline at end of file
diff --git a/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-0.000-22.000.sql b/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-0.000-22.000.sql
deleted file mode 100644
index 9796911976..0000000000
--- a/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-0.000-22.000.sql
+++ /dev/null
@@ -1,866 +0,0 @@
-/*
- * Copyright (c) 2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* vehicle-0.00-1.00.sql */
-
-CREATE SCHEMA vehicle;
-GO
-
-CREATE TABLE vehicle.Colors
-(
-    Name NVARCHAR(30) NOT NULL,
-    Hex TEXT,
-
-    CONSTRAINT PK_Colors PRIMARY KEY (Name)
-);
-
-CREATE TABLE vehicle.Manufacturers
-(
-    RowId INT IDENTITY(1,1),
-    Name NVARCHAR(255) NOT NULL,
-
-    CONSTRAINT PK_Manufacturers PRIMARY KEY (RowId)
-);
-
-CREATE TABLE vehicle.Models
-(
-    RowId INT IDENTITY(1,1),
-    ManufacturerId INT NOT NULL,
-    Name NVARCHAR(255) NOT NULL,
-
-    CONSTRAINT PK_Models PRIMARY KEY (RowId),
-    CONSTRAINT FK_Models_Manufacturers FOREIGN KEY (ManufacturerId) REFERENCES vehicle.Manufacturers(RowId)
-);
-
-CREATE TABLE vehicle.Vehicles
-(
-    RowId INT IDENTITY(1,1) NOT NULL,
-    Container ENTITYID NOT NULL,
-    CreatedBy USERID NOT NULL,
-    Created DATETIME NOT NULL,
-    ModifiedBy USERID NOT NULL,
-    Modified DATETIME NOT NULL,
-
-    ModelId INT NOT NULL,
-    Color NVARCHAR(30) NOT NULL,
-
-    ModelYear INT NOT NULL,
-    Milage INT NOT NULL,
-    LastService DATETIME NOT NULL,
-
-    CONSTRAINT PK_Vehicles PRIMARY KEY (RowId),
-    CONSTRAINT FK_Vehicles_Models FOREIGN KEY (ModelId) REFERENCES vehicle.Models(RowId),
-    CONSTRAINT FK_Vehicles_Colors FOREIGN KEY (Color) REFERENCES vehicle.Colors(Name)
-);
-
-/* vehicle-11.30-12.10.sql */
-
--- add container constraint
-ALTER TABLE vehicle.Vehicles
-    ADD CONSTRAINT FK_Vehicles_Container FOREIGN KEY (Container) REFERENCES core.Containers (EntityId);
-
-/* vehicle-12.30-13.10.sql */
-
-CREATE TABLE vehicle.emissiontest (
-  rowid int identity(1,1),
-  name varchar(100),
-  container entityid,
-  parentTest int,
-  vehicleId int,
-  result bit,
-
-  CONSTRAINT PK_emissiontest PRIMARY KEY (rowid),
-  CONSTRAINT FK_emissiontest_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-/* vehicle-13.10-13.20.sql */
-
-CREATE TABLE vehicle.etl_source(
-  RowId INT IDENTITY(1,1),
-  container entityid,
-  created DATETIME,
-  modified DATETIME,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  TransformRun INT,
-  rowversion rowversion,
-
-CONSTRAINT PK_etlsource PRIMARY KEY (rowid),
-  CONSTRAINT AK_etlsource UNIQUE (container,id),
-  CONSTRAINT FK_etlsource_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-
-CREATE TABLE vehicle.etl_target(
-  RowId INT IDENTITY(1,1),
-  container entityid,
-  created DATETIME,
-  modified DATETIME,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget UNIQUE (container,id),
-  CONSTRAINT FK_etltarget_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-CREATE TABLE vehicle.etl_target2
-(
-  RowId INT NOT NULL,
-  container entityid,
-  created DATETIME,
-  modified DATETIME,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget2 PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget2 UNIQUE (container,id),
-  CONSTRAINT FK_etltarget2_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-CREATE TABLE vehicle.Owner
-(
-  RowId INT IDENTITY(1,1),
-  container ENTITYID,
-  created DATETIME,
-  createdby USERID,
-  modified DATETIME,
-  modifiedby USERID,
-
-  first_name VARCHAR(100),
-  last_name VARCHAR(100),
-  email VARCHAR(100),
-  gender VARCHAR(10),
-  race VARCHAR(100),
-  city VARCHAR(100),
-  state VARCHAR(100),
-  zip VARCHAR(10),
-  text VARCHAR(1000),
-  birth_date DATETIME,
-  CONSTRAINT PK_owner PRIMARY KEY (container,rowid)
-);
-
-
-CREATE TABLE vehicle.OwnerBackup
-(
-  RowId INT IDENTITY(1,1),
-  container ENTITYID,
-  created DATETIME,
-  createdby USERID,
-  modified DATETIME,
-  modifiedby USERID,
-
-  first_name VARCHAR(100),
-  last_name VARCHAR(100),
-  email VARCHAR(100),
-  gender VARCHAR(10),
-  race VARCHAR(100),
-  city VARCHAR(100),
-  state VARCHAR(100),
-  zip VARCHAR(10),
-  text VARCHAR(1000),
-  birth_date DATETIME,
-  diTransformRunId INT,
-
-  CONSTRAINT PK_ownerbackup PRIMARY KEY (container,rowid)
-);
-
-/* vehicle-13.20-13.30.sql */
-
-CREATE TABLE vehicle.Transfer
-(
-    RowId INT NOT NULL,
-    TransferStart DATETIME NOT NULL,
-	transferComplete DATETIME NULL,
-	schemaName NVARCHAR(100) NOT NULL,
-	description NVARCHAR(1000) NULL,
-	log NTEXT NULL,
-	status NVARCHAR(10) NULL,
-	container dbo.ENTITYID NULL
-);
-
-/* vehicle-13.30-14.10.sql */
-
-ALTER TABLE vehicle.Transfer  ADD CONSTRAINT FK_etltransfer_container FOREIGN KEY(container)
-	REFERENCES core.Containers (EntityId)
-ALTER TABLE vehicle.transfer ADD CONSTRAINT PK_transfer PRIMARY KEY (rowid);
-GO
-
-
-CREATE PROCEDURE vehicle.etlMissingTransformRunId
-AS
-BEGIN
-	SELECT 1
-END
-
-GO
-
-/* vehicle-15.00-15.01.sql */
-
-CREATE PROCEDURE [vehicle].[etlTestResultSet]
- 	@transformRunId int,
- 	@containerId varchar(100) = NULL OUTPUT,
- 	@rowsInserted int = 0 OUTPUT,
- 	@rowsDeleted int = 0 OUTPUT,
- 	@rowsModified int = 0 OUTPUT,
- 	@returnMsg varchar(100) = 'default message' OUTPUT,
- 	@debug varchar(1000) = '',
- 	@filterRunId int = null,
- 	@filterStartTimeStamp datetime = null OUTPUT,
- 	@filterEndTimeStamp datetime = null OUTPUT,
- 	@testMode int,
- 	@testInOutParam varchar(10) = null OUTPUT,
- 	@runCount int = 1 OUTPUT,
- 	@previousFilterRunId int = null OUTPUT,
- 	@previousFilterStartTimeStamp datetime = null OUTPUT,
- 	@previousFilterEndTimeStamp datetime = null OUTPUT
- AS
- BEGIN
-
- IF @testMode = 9
- BEGIN
- 	SELECT * FROM vehicle.etl_source WHERE container = @containerId
- END
-
- IF @testInOutParam IS NOT NULL SET @testInOutParam = 'after'
-
- RETURN 0
-
- END
-
- GO
-
-/* vehicle-15.10-15.11.sql */
-
-CREATE TABLE vehicle.etl_delete
-(
-  RowId INT IDENTITY(1,1),
-  container entityid,
-  created DATETIME,
-  modified DATETIME,
-
-  id VARCHAR(9),
-  name VARCHAR(100),
-  TransformRun INT,
-  rowversion rowversion,
-  CONSTRAINT PK_etldelete PRIMARY KEY (rowid),
-  CONSTRAINT AK_etldelete UNIQUE (container,id),
-  CONSTRAINT FK_etldelete_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-GO
-
-/* vehicle-15.20-15.21.sql */
-
--- =============================================
--- Author:		Tony Galuhn
--- Create date: 11/22/2013 / modified 1/28/2014
--- Description:	sp for ETL testing
--- =============================================
-CREATE PROCEDURE vehicle.etlTest
-	@transformRunId int,
-	@containerId entityId = NULL OUTPUT,
-	@rowsInserted int = 0 OUTPUT,
-	@rowsDeleted int = 0 OUTPUT,
-	@rowsModified int = 0 OUTPUT,
-	@returnMsg varchar(100) = 'default message' OUTPUT,
-	@debug varchar(1000) = '',
-	@filterRunId int = null,
-	@filterStartTimeStamp datetime = null,
-	@filterEndTimeStamp datetime = null,
-	@testMode int,
-	@testInOutParam varchar(10) = null OUTPUT,
-	@runCount int = 1 OUTPUT,
-	@previousFilterRunId int = null OUTPUT,
-	@previousFilterStartTimeStamp datetime = null OUTPUT,
-	@previousFilterEndTimeStamp datetime = null OUTPUT
-AS
-BEGIN
-
-/*
-	Test modes
-	1	normal operation
-	2	return code > 0
-	3	raise error
-	4	input/output parameter persistence
-	5	override of persisted input/output parameter
-	6	Run filter strategy, require @filterRunId. Test persistence.
-	7	Modified since filter strategy, require @filterStartTimeStamp & @filterEndTimeStamp. Test persistence.
-
-*/
-
-IF @testMode IS NULL
-BEGIN
-	SET @returnMsg = 'No testMode set'
-	RETURN 1
-END
-
-IF @testMode = 1
-BEGIN
-	print 'Test print statement logging'
-	SET @rowsInserted = 1
-	SET @rowsDeleted = 2
-	SET @rowsModified = 4
-	SET @returnMsg = 'Test returnMsg logging'
-	RETURN 0
-END
-
-IF @testMode = 2 RETURN 1
-
-IF @testMode = 3
-BEGIN
-	SET @returnMsg = 'Intentional SQL Exception From Inside Proc'
-	RAISERROR(@returnMsg, 11, 1)
-END
-
-IF @testMode = 4 AND @testInOutParam != 'after' AND @runCount > 1
-BEGIN
-	SET @returnMsg = 'Expected value "after" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam
-	RETURN 1
-END
-
-IF @testMode = 5 AND @testInOutParam != 'before' AND @runCount > 1
-BEGIN
-	SET @returnMsg = 'Expected value "before" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam
-	RETURN 1
-END
-
-IF @testMode = 6
-BEGIN
-	IF @filterRunId IS NULL
-	BEGIN
-		SET @returnMsg = 'Required @filterRunId value not supplied'
-		RETURN 1
-	END
-	IF @runCount > 1 AND (@previousFilterRunId IS NULL OR @previousFilterRunId <= @filterRunId)
-	BEGIN
-		SET @returnMsg = 'Required @filterRunId was not persisted from previous run.'
-		RETURN 1
-	END
-	SET @previousFilterRunId = @filterRunId
-END
-
-IF @testMode = 7
-BEGIN
-	IF @runCount > 1 AND (@previousFilterStartTimeStamp IS NULL OR @previousFilterEndTimeStamp IS NULL
-							OR @previousFilterStartTimeStamp <= @filterStartTimeStamp OR @previousFilterEndTimeStamp <= @filterEndTimeStamp)
-	BEGIN
-		SET @returnMsg = 'Required @filterStartTimeStamp or @filterEndTimeStamp were not persisted from previous run.'
-		RETURN 1
-	END
-	SET @previousFilterStartTimeStamp = @filterStartTimeStamp
-	SET @previousFilterEndTimeStamp = @filterEndTimeStamp
-END
-
--- set value for persistence tests
-IF @testInOutParam IS NOT NULL SET @testInOutParam = 'after'
-
-RETURN 0
-
-END
-GO
-
-/* vehicle-16.20-16.30.sql */
-
--- For testing merge, need to have the PK on this table not be IDENTITY
-DROP TABLE vehicle.etl_target;
-CREATE TABLE vehicle.etl_target(
-  RowId INT NOT NULL,
-  container entityid,
-  created DATETIME,
-  modified DATETIME,
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget UNIQUE (container,id),
-  CONSTRAINT FK_etltarget_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-
-CREATE TABLE vehicle.etl_180column_source(
-  RowId int IDENTITY(1,1) NOT NULL,
-  container dbo.ENTITYID NULL,
-  created datetime NULL,
-  modified datetime NULL,
-  field5 INT NULL,
-  field6 INT NULL,
-  field7 INT NULL,
-  field8 INT NULL,
-  field9 INT NULL,
-  field10 INT NULL,
-  field11 INT NULL,
-  field12 INT NULL,
-  field13 INT NULL,
-  field14 INT NULL,
-  field15 INT NULL,
-  field16 INT NULL,
-  field17 INT NULL,
-  field18 INT NULL,
-  field19 INT NULL,
-  field20 INT NULL,
-  field21 INT NULL,
-  field22 INT NULL,
-  field23 INT NULL,
-  field24 INT NULL,
-  field25 INT NULL,
-  field26 INT NULL,
-  field27 INT NULL,
-  field28 INT NULL,
-  field29 INT NULL,
-  field30 INT NULL,
-  field31 INT NULL,
-  field32 INT NULL,
-  field33 INT NULL,
-  field34 INT NULL,
-  field35 INT NULL,
-  field36 INT NULL,
-  field37 INT NULL,
-  field38 INT NULL,
-  field39 INT NULL,
-  field40 INT NULL,
-  field41 INT NULL,
-  field42 INT NULL,
-  field43 INT NULL,
-  field44 INT NULL,
-  field45 INT NULL,
-  field46 INT NULL,
-  field47 INT NULL,
-  field48 INT NULL,
-  field49 INT NULL,
-  field50 INT NULL,
-  field51 INT NULL,
-  field52 INT NULL,
-  field53 INT NULL,
-  field54 INT NULL,
-  field55 INT NULL,
-  field56 INT NULL,
-  field57 INT NULL,
-  field58 INT NULL,
-  field59 INT NULL,
-  field60 INT NULL,
-  field61 INT NULL,
-  field62 INT NULL,
-  field63 INT NULL,
-  field64 INT NULL,
-  field65 INT NULL,
-  field66 INT NULL,
-  field67 INT NULL,
-  field68 INT NULL,
-  field69 INT NULL,
-  field70 INT NULL,
-  field71 INT NULL,
-  field72 INT NULL,
-  field73 INT NULL,
-  field74 INT NULL,
-  field75 INT NULL,
-  field76 INT NULL,
-  field77 INT NULL,
-  field78 INT NULL,
-  field79 INT NULL,
-  field80 INT NULL,
-  field81 INT NULL,
-  field82 INT NULL,
-  field83 INT NULL,
-  field84 INT NULL,
-  field85 INT NULL,
-  field86 INT NULL,
-  field87 INT NULL,
-  field88 INT NULL,
-  field89 INT NULL,
-  field90 INT NULL,
-  field91 INT NULL,
-  field92 INT NULL,
-  field93 INT NULL,
-  field94 INT NULL,
-  field95 INT NULL,
-  field96 INT NULL,
-  field97 INT NULL,
-  field98 INT NULL,
-  field99 INT NULL,
-  field100 INT NULL,
-  field101 INT NULL,
-  field102 INT NULL,
-  field103 INT NULL,
-  field104 INT NULL,
-  field105 INT NULL,
-  field106 INT NULL,
-  field107 INT NULL,
-  field108 INT NULL,
-  field109 INT NULL,
-  field110 INT NULL,
-  field111 INT NULL,
-  field112 INT NULL,
-  field113 INT NULL,
-  field114 INT NULL,
-  field115 INT NULL,
-  field116 INT NULL,
-  field117 INT NULL,
-  field118 INT NULL,
-  field119 INT NULL,
-  field120 INT NULL,
-  field121 INT NULL,
-  field122 INT NULL,
-  field123 INT NULL,
-  field124 INT NULL,
-  field125 INT NULL,
-  field126 INT NULL,
-  field127 INT NULL,
-  field128 INT NULL,
-  field129 INT NULL,
-  field130 INT NULL,
-  field131 INT NULL,
-  field132 INT NULL,
-  field133 INT NULL,
-  field134 INT NULL,
-  field135 INT NULL,
-  field136 INT NULL,
-  field137 INT NULL,
-  field138 INT NULL,
-  field139 INT NULL,
-  field140 INT NULL,
-  field141 INT NULL,
-  field142 INT NULL,
-  field143 INT NULL,
-  field144 INT NULL,
-  field145 INT NULL,
-  field146 INT NULL,
-  field147 INT NULL,
-  field148 INT NULL,
-  field149 INT NULL,
-  field150 INT NULL,
-  field151 INT NULL,
-  field152 INT NULL,
-  field153 INT NULL,
-  field154 INT NULL,
-  field155 INT NULL,
-  field156 INT NULL,
-  field157 INT NULL,
-  field158 INT NULL,
-  field159 INT NULL,
-  field160 INT NULL,
-  field161 INT NULL,
-  field162 INT NULL,
-  field163 INT NULL,
-  field164 INT NULL,
-  field165 INT NULL,
-  field166 INT NULL,
-  field167 INT NULL,
-  field168 INT NULL,
-  field169 INT NULL,
-  field170 INT NULL,
-  field171 INT NULL,
-  field172 INT NULL,
-  field173 INT NULL,
-  field174 INT NULL,
-  field175 INT NULL,
-  field176 INT NULL,
-  field177 INT NULL,
-  field178 INT NULL,
-  field179 INT NULL,
-  field180 INT NULL,
-
-  CONSTRAINT PK_etl_180column_source PRIMARY KEY (RowId),
-  CONSTRAINT FK_etl_180column_source_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-CREATE TABLE vehicle.etl_180column_target(
-  RowId int NOT NULL,
-  container dbo.ENTITYID NULL,
-  created datetime NULL,
-  modified datetime NULL,
-  field5 INT NULL,
-  field6 INT NULL,
-  field7 INT NULL,
-  field8 INT NULL,
-  field9 INT NULL,
-  field10 INT NULL,
-  field11 INT NULL,
-  field12 INT NULL,
-  field13 INT NULL,
-  field14 INT NULL,
-  field15 INT NULL,
-  field16 INT NULL,
-  field17 INT NULL,
-  field18 INT NULL,
-  field19 INT NULL,
-  field20 INT NULL,
-  field21 INT NULL,
-  field22 INT NULL,
-  field23 INT NULL,
-  field24 INT NULL,
-  field25 INT NULL,
-  field26 INT NULL,
-  field27 INT NULL,
-  field28 INT NULL,
-  field29 INT NULL,
-  field30 INT NULL,
-  field31 INT NULL,
-  field32 INT NULL,
-  field33 INT NULL,
-  field34 INT NULL,
-  field35 INT NULL,
-  field36 INT NULL,
-  field37 INT NULL,
-  field38 INT NULL,
-  field39 INT NULL,
-  field40 INT NULL,
-  field41 INT NULL,
-  field42 INT NULL,
-  field43 INT NULL,
-  field44 INT NULL,
-  field45 INT NULL,
-  field46 INT NULL,
-  field47 INT NULL,
-  field48 INT NULL,
-  field49 INT NULL,
-  field50 INT NULL,
-  field51 INT NULL,
-  field52 INT NULL,
-  field53 INT NULL,
-  field54 INT NULL,
-  field55 INT NULL,
-  field56 INT NULL,
-  field57 INT NULL,
-  field58 INT NULL,
-  field59 INT NULL,
-  field60 INT NULL,
-  field61 INT NULL,
-  field62 INT NULL,
-  field63 INT NULL,
-  field64 INT NULL,
-  field65 INT NULL,
-  field66 INT NULL,
-  field67 INT NULL,
-  field68 INT NULL,
-  field69 INT NULL,
-  field70 INT NULL,
-  field71 INT NULL,
-  field72 INT NULL,
-  field73 INT NULL,
-  field74 INT NULL,
-  field75 INT NULL,
-  field76 INT NULL,
-  field77 INT NULL,
-  field78 INT NULL,
-  field79 INT NULL,
-  field80 INT NULL,
-  field81 INT NULL,
-  field82 INT NULL,
-  field83 INT NULL,
-  field84 INT NULL,
-  field85 INT NULL,
-  field86 INT NULL,
-  field87 INT NULL,
-  field88 INT NULL,
-  field89 INT NULL,
-  field90 INT NULL,
-  field91 INT NULL,
-  field92 INT NULL,
-  field93 INT NULL,
-  field94 INT NULL,
-  field95 INT NULL,
-  field96 INT NULL,
-  field97 INT NULL,
-  field98 INT NULL,
-  field99 INT NULL,
-  field100 INT NULL,
-  field101 INT NULL,
-  field102 INT NULL,
-  field103 INT NULL,
-  field104 INT NULL,
-  field105 INT NULL,
-  field106 INT NULL,
-  field107 INT NULL,
-  field108 INT NULL,
-  field109 INT NULL,
-  field110 INT NULL,
-  field111 INT NULL,
-  field112 INT NULL,
-  field113 INT NULL,
-  field114 INT NULL,
-  field115 INT NULL,
-  field116 INT NULL,
-  field117 INT NULL,
-  field118 INT NULL,
-  field119 INT NULL,
-  field120 INT NULL,
-  field121 INT NULL,
-  field122 INT NULL,
-  field123 INT NULL,
-  field124 INT NULL,
-  field125 INT NULL,
-  field126 INT NULL,
-  field127 INT NULL,
-  field128 INT NULL,
-  field129 INT NULL,
-  field130 INT NULL,
-  field131 INT NULL,
-  field132 INT NULL,
-  field133 INT NULL,
-  field134 INT NULL,
-  field135 INT NULL,
-  field136 INT NULL,
-  field137 INT NULL,
-  field138 INT NULL,
-  field139 INT NULL,
-  field140 INT NULL,
-  field141 INT NULL,
-  field142 INT NULL,
-  field143 INT NULL,
-  field144 INT NULL,
-  field145 INT NULL,
-  field146 INT NULL,
-  field147 INT NULL,
-  field148 INT NULL,
-  field149 INT NULL,
-  field150 INT NULL,
-  field151 INT NULL,
-  field152 INT NULL,
-  field153 INT NULL,
-  field154 INT NULL,
-  field155 INT NULL,
-  field156 INT NULL,
-  field157 INT NULL,
-  field158 INT NULL,
-  field159 INT NULL,
-  field160 INT NULL,
-  field161 INT NULL,
-  field162 INT NULL,
-  field163 INT NULL,
-  field164 INT NULL,
-  field165 INT NULL,
-  field166 INT NULL,
-  field167 INT NULL,
-  field168 INT NULL,
-  field169 INT NULL,
-  field170 INT NULL,
-  field171 INT NULL,
-  field172 INT NULL,
-  field173 INT NULL,
-  field174 INT NULL,
-  field175 INT NULL,
-  field176 INT NULL,
-  field177 INT NULL,
-  field178 INT NULL,
-  field179 INT NULL,
-  field180 INT NULL,
-
-  CONSTRAINT PK_etl_180column_target PRIMARY KEY (RowId),
-  CONSTRAINT FK_etl_180column_target_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
--- Undo change to this table from the 16.20-16.21 script. Make the merge test use etl_target2 instead
-DROP TABLE vehicle.etl_target;
-CREATE TABLE vehicle.etl_target(
-  RowId INT IDENTITY(1,1),
-  container entityid,
-  created DATETIME,
-  modified DATETIME,
-  id VARCHAR(9),
-  name VARCHAR(100),
-  diTransformRunId INT,
-
-  CONSTRAINT PK_etltarget PRIMARY KEY (rowid),
-  CONSTRAINT AK_etltarget UNIQUE (container,id),
-  CONSTRAINT FK_etltarget_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
-);
-
-TRUNCATE TABLE vehicle.etl_target2;
-ALTER TABLE vehicle.etl_target2 DROP CONSTRAINT PK_etltarget2;
-ALTER TABLE vehicle.etl_target2 DROP CONSTRAINT AK_etltarget2;
-ALTER TABLE vehicle.etl_target2 ALTER COLUMN container entityid NOT NULL;
-GO
-ALTER TABLE vehicle.etl_target2 ADD CONSTRAINT AK_etltarget2 UNIQUE (Container, id);
-ALTER TABLE vehicle.etl_target2 ADD CONSTRAINT PK_etltarget2 PRIMARY KEY (RowId, container);
-
-TRUNCATE TABLE vehicle.etl_180column_target;
-ALTER TABLE vehicle.etl_180column_target DROP CONSTRAINT PK_etl_180column_target;
-ALTER TABLE vehicle.etl_180column_target ALTER COLUMN container entityid NOT NULL;
-GO
-ALTER TABLE vehicle.etl_180column_target ADD CONSTRAINT PK_etl_180column_target PRIMARY KEY (RowId, container);
-
-/* vehicle-16.30-17.10.sql */
-
-ALTER TABLE vehicle.Models
-    ADD InitialReleaseYear INT;
-
--- Drop tables / procedures for ETL testing from this schema; they've been moved to the etltest schema.
-DROP TABLE vehicle.etl_source;
-DROP TABLE vehicle.etl_target;
-DROP TABLE vehicle.etl_target2;
-DROP TABLE vehicle.transfer;
-DROP TABLE vehicle.etl_180column_source;
-DROP TABLE vehicle.etl_180column_target;
-DROP TABLE vehicle.etl_delete;
-
-DROP PROCEDURE vehicle.etlTest;
-DROP PROCEDURE vehicle.etlTestResultSet;
--- This procedure wasn't being used
-DROP PROCEDURE vehicle.etlMissingTransformRunId
-
--- These two tables seem to have been introduced for ETL testing, but were never used
-DROP TABLE vehicle.owner;
-DROP TABLE vehicle.ownerbackup;
-
-/* vehicle-17.10-17.20.sql */
-
-ALTER TABLE vehicle.Colors ADD TriggerScriptProperty NVARCHAR(100);
-
-/* vehicle-18.20-18.30.sql */
-
-ALTER TABLE vehicle.Models ADD ThumbnailImage NVARCHAR(60);
-ALTER TABLE vehicle.Models ADD Image NVARCHAR(60);
-ALTER TABLE vehicle.Models ADD PopupImage NVARCHAR(60);
-
-/* vehicle-19.20-19.30.sql */
-
-CREATE TABLE vehicle.FirstFKTable
-(
-    RowId INT IDENTITY(1,1),
-    StartCycleCol INT NOT NULL UNIQUE,
-    CONSTRAINT PK_FirstFKTable PRIMARY KEY (RowId)
-);
-
-CREATE TABLE vehicle.SecondFKTable
-(
-    RowId INT IDENTITY(1,1),
-    StartCycleCol INT NOT NULL UNIQUE,
-    CycleCol INT NOT NULL UNIQUE,
-
-    CONSTRAINT PK_SecondFKTable PRIMARY KEY (RowId)
-);
-
-CREATE TABLE vehicle.ThirdFKTable
-(
-    RowId INT IDENTITY(1,1),
-    CycleCol INT NOT NULL UNIQUE,
-
-    CONSTRAINT PK_ThirdFKTable PRIMARY KEY (RowId)
-);
-
-ALTER TABLE vehicle.FirstFKTable ADD CONSTRAINT FK_SecondFKTable_StartCycleCol FOREIGN KEY (StartCycleCol) REFERENCES vehicle.SecondFKTable (StartCycleCol);
-ALTER TABLE vehicle.SecondFKTable ADD CONSTRAINT FK_ThirdFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.ThirdFKTable (CycleCol);
-ALTER TABLE vehicle.ThirdFKTable ADD CONSTRAINT FK_SecondFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.SecondFKTable (CycleCol);
-
-/* 21.xxx SQL scripts */
-
-ALTER TABLE vehicle.Vehicles ADD TriggerScriptContainer ENTITYID;
\ No newline at end of file
diff --git a/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-0.000-23.000.sql b/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-0.000-23.000.sql
new file mode 100644
index 0000000000..f96dfe511a
--- /dev/null
+++ b/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-0.000-23.000.sql
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE SCHEMA vehicle;
+GO
+
+CREATE TABLE vehicle.Colors
+(
+    Name NVARCHAR(30) NOT NULL,
+    Hex TEXT,
+
+    CONSTRAINT PK_Colors PRIMARY KEY (Name)
+);
+
+ALTER TABLE vehicle.Colors ADD TriggerScriptProperty NVARCHAR(100);
+
+CREATE TABLE vehicle.Manufacturers
+(
+    RowId INT IDENTITY(1,1),
+    Name NVARCHAR(255) NOT NULL,
+
+    CONSTRAINT PK_Manufacturers PRIMARY KEY (RowId)
+);
+
+CREATE TABLE vehicle.Models
+(
+    RowId INT IDENTITY(1,1),
+    ManufacturerId INT NOT NULL,
+    Name NVARCHAR(255) NOT NULL,
+
+    CONSTRAINT PK_Models PRIMARY KEY (RowId),
+    CONSTRAINT FK_Models_Manufacturers FOREIGN KEY (ManufacturerId) REFERENCES vehicle.Manufacturers(RowId)
+);
+
+ALTER TABLE vehicle.Models ADD InitialReleaseYear INT;
+ALTER TABLE vehicle.Models ADD ThumbnailImage NVARCHAR(60);
+ALTER TABLE vehicle.Models ADD Image NVARCHAR(60);
+ALTER TABLE vehicle.Models ADD PopupImage NVARCHAR(60);
+
+CREATE TABLE vehicle.Vehicles
+(
+    RowId INT IDENTITY(1,1) NOT NULL,
+    Container ENTITYID NOT NULL,
+    CreatedBy USERID NOT NULL,
+    Created DATETIME NOT NULL,
+    ModifiedBy USERID NOT NULL,
+    Modified DATETIME NOT NULL,
+
+    ModelId INT NOT NULL,
+    Color NVARCHAR(30) NOT NULL,
+
+    ModelYear INT NOT NULL,
+    Milage INT NOT NULL,
+    LastService DATETIME NOT NULL,
+
+    CONSTRAINT PK_Vehicles PRIMARY KEY (RowId),
+    CONSTRAINT FK_Vehicles_Models FOREIGN KEY (ModelId) REFERENCES vehicle.Models(RowId),
+    CONSTRAINT FK_Vehicles_Colors FOREIGN KEY (Color) REFERENCES vehicle.Colors(Name)
+);
+
+-- add container constraint
+ALTER TABLE vehicle.Vehicles ADD CONSTRAINT FK_Vehicles_Container FOREIGN KEY (Container) REFERENCES core.Containers (EntityId);
+ALTER TABLE vehicle.Vehicles ADD TriggerScriptContainer ENTITYID;
+
+CREATE TABLE vehicle.emissiontest (
+  rowid int identity(1,1),
+  name varchar(100),
+  container entityid,
+  parentTest int,
+  vehicleId int,
+  result bit,
+
+  CONSTRAINT PK_emissiontest PRIMARY KEY (rowid),
+  CONSTRAINT FK_emissiontest_container FOREIGN KEY (container) REFERENCES core.containers (entityid)
+);
+
+CREATE TABLE vehicle.FirstFKTable
+(
+    RowId INT IDENTITY(1,1),
+    StartCycleCol INT NOT NULL UNIQUE,
+    CONSTRAINT PK_FirstFKTable PRIMARY KEY (RowId)
+);
+
+CREATE TABLE vehicle.SecondFKTable
+(
+    RowId INT IDENTITY(1,1),
+    StartCycleCol INT NOT NULL UNIQUE,
+    CycleCol INT NOT NULL UNIQUE,
+
+    CONSTRAINT PK_SecondFKTable PRIMARY KEY (RowId)
+);
+
+ALTER TABLE vehicle.FirstFKTable ADD CONSTRAINT FK_SecondFKTable_StartCycleCol FOREIGN KEY (StartCycleCol) REFERENCES vehicle.SecondFKTable (StartCycleCol);
+
+CREATE TABLE vehicle.ThirdFKTable
+(
+    RowId INT IDENTITY(1,1),
+    CycleCol INT NOT NULL UNIQUE,
+
+    CONSTRAINT PK_ThirdFKTable PRIMARY KEY (RowId)
+);
+
+ALTER TABLE vehicle.SecondFKTable ADD CONSTRAINT FK_ThirdFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.ThirdFKTable (CycleCol);
+ALTER TABLE vehicle.ThirdFKTable ADD CONSTRAINT FK_SecondFKTable_CycleCol FOREIGN KEY (CycleCol) REFERENCES vehicle.SecondFKTable (CycleCol);
diff --git a/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-22.001-22.002.sql b/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-22.001-22.002.sql
deleted file mode 100644
index 1be261280d..0000000000
--- a/modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-22.001-22.002.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-IF COL_LENGTH('vehicle.Vehicles', 'TriggerScriptContainer') IS NULL
-BEGIN
-ALTER TABLE vehicle.Vehicles ADD TriggerScriptContainer ENTITYID;
-END;
\ No newline at end of file
diff --git a/src/org/labkey/test/LabKeySiteWrapper.java b/src/org/labkey/test/LabKeySiteWrapper.java
index 3775d23ddb..0a5db1f310 100644
--- a/src/org/labkey/test/LabKeySiteWrapper.java
+++ b/src/org/labkey/test/LabKeySiteWrapper.java
@@ -1576,7 +1576,7 @@ public List<String> waitForRunningPipelineJobs(long timeoutMilliseconds)
             final List<String> descriptions = pipelineStatusTable.getColumnDataAsText("Description");
             fail("Timed out waiting for pipeline job to start. Waiting on " + (descriptions.isEmpty() ? "<unknown>" : descriptions));
         }
-        assertEquals("Running pipeline jobs were found.  Timeout:" + timeoutMilliseconds + "sec", 0, statusValues.size() - getFinishedCount(statusValues));
+        assertEquals("Running pipeline jobs were found. Timeout: " + timeoutMilliseconds + "ms", 0, statusValues.size() - getFinishedCount(statusValues));
 
         return statusValues;
     }
diff --git a/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java b/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
index 8454da1716..34aa785d82 100644
--- a/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
+++ b/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
@@ -265,7 +265,7 @@ private ReactSelect getEntityTypeByPosition(int index)
     {
         return ReactSelect.finder(getDriver())
                 .withNamedInput(String.format("entityType%d", index))
-                .find(this);
+                .waitFor(this);
     }
 
     public ReactSelect getEntityType(String entityName)