diff --git a/src/server/test/common.js b/src/server/test/common.js
index 0ebfcb730d..3373ac9a49 100644
--- a/src/server/test/common.js
+++ b/src/server/test/common.js
@@ -2,101 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* This file exports two useful items: testDB, which provides the method .getConnection,
- * returning a connection to the testing database, and recreateDB, which destroys the
- * database and creates a new schema there.
- */
+//This file exports a pre-configured mocha, chai, and expect for use in tests.
 
 const mocha = require('mocha');
 const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');
 const chaiHttp = require('chai-http');
-const bcrypt = require('bcryptjs');
 const expect = chai.expect;
-const { log, LogLevel } = require('../log');
-
-// TODO: Move logging controls to a better place.
-// During testing do not show errors since many tests generate them.
-log.level = LogLevel.SILENT;
-// If tests are failing then turning on the console messages can help. Commenting the line
-// above and uncommenting the next line will do that.
-// log.level = LogLevel.DEBUG;
-// During testing do not do emails. Since DB wiped and not set up for emails this would not do anything.
-log.emailLevel = LogLevel.SILENT;
-// Logging to the DB during testing has issues. First, the test DB is wiped before each test so it does not actually
-// stay around. Second, if one test finishes
-// quickly after the DB logging starts (async) then the next test starts and the beforeEach wipes the DB.
-// If the attempt to put the log msg in the DB
-// happens before it is initialized again then the log table is missing and causes an error.
-log.logToDb = false;
-
-const User = require('../models/User');
-const { getDB, createSchema, stopDB } = require('../models/database');
-const { swapConnection, dropConnection } = require('../db');
-const app = require('../app');
 
 // Configure Chai to use the required plugins
 chai.use(chaiAsPromised);
 chai.use(chaiHttp);
 
-// Global database connection object, whose members are accessible to DB-touching tests.
-// For instance, call:
-// conn = testDB.getConnection();
-// doSomething(conn)
-let testDB = {
-	_connection: null,
-	config: null,
-	getConnection: function () {
-		return this._connection;
-	}
-};
-
-function connectTestDB() {
-	const testDBConfig = {
-		user: process.env.OED_DB_TEST_USER || process.env.OED_DB_USER,
-		database: process.env.OED_DB_TEST_DATABASE,
-		password: process.env.OED_DB_TEST_PASSWORD || process.env.OED_DB_PASSWORD,
-		host: process.env.OED_DB_TEST_HOST || process.env.OED_DB_HOST,
-		port: process.env.OED_DB_TEST_PORT || process.env.OED_DB_PORT
-	};
-
-	stopDB();
-	testDB._connection = getDB(testDBConfig);
-	testDB.config = testDBConfig;
-	swapConnection(testDB.config, testDB._connection);
-}
-
-// The user for use by tests.
-const testUser = new User(undefined, 'test@example.invalid', bcrypt.hashSync('password', 10), User.role.ADMIN);
-testUser.password = 'password';
-
-async function recreateDB() {
-	const conn = testDB.getConnection();
-	// This should drop all database objects, as long as they were all created by the current database user
-	// They should be, since they were all created during a previous test.
-	await conn.none('DROP OWNED BY current_user;');
-	await createSchema(conn);
-	await testUser.insert(conn);
-}
-
-mocha.before(() => {
-	connectTestDB();
-});
-
-mocha.beforeEach(async () => {
-	await recreateDB();
-});
-
-mocha.after(() => {
-	dropConnection();
-});
-
 module.exports = {
 	chai,
 	mocha,
 	expect,
-	app,
-	testUser,
-	recreateDB,
-	testDB
 };
diff --git a/src/server/test/commonTestDB.js b/src/server/test/commonTestDB.js
new file mode 100644
index 0000000000..66c3cf7b96
--- /dev/null
+++ b/src/server/test/commonTestDB.js
@@ -0,0 +1,91 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* This file exports two useful items: testDB, which provides the method .getConnection,
+ * returning a connection to the testing database, and recreateDB, which destroys the
+ * database and creates a new schema there.
+ */
+
+const { log, LogLevel } = require('../log');
+
+// TODO: Move logging controls to a better place.
+// During testing do not show errors since many tests generate them.
+log.level = LogLevel.SILENT;
+// If tests are failing then turning on the console messages can help. Commenting the line
+// above and uncommenting the next line will do that.
+// log.level = LogLevel.DEBUG;
+// During testing do not do emails. Since DB wiped and not set up for emails this would not do anything.
+log.emailLevel = LogLevel.SILENT;
+// Logging to the DB during testing has issues. First, the test DB is wiped before each test so it does not actually
+// stay around. Second, if one test finishes
+// quickly after the DB logging starts (async) then the next test starts and the beforeEach wipes the DB.
+// If the attempt to put the log msg in the DB
+// happens before it is initialized again then the log table is missing and causes an error.
+log.logToDb = false;
+
+const User = require('../models/User');
+const { getDB, createSchema, stopDB } = require('../models/database');
+const { swapConnection, dropConnection } = require('../db');
+const app = require('../app');
+const bcrypt = require('bcryptjs');
+const { mocha, chai, expect } = require('./common');
+
+// Global database connection object, whose members are accessible to DB-touching tests.
+// For instance, call:
+// conn = testDB.getConnection();
+// doSomething(conn)
+let testDB = {
+	_connection: null,
+	config: null,
+	getConnection: function () {
+		return this._connection;
+	}
+};
+
+function connectTestDB() {
+	const testDBConfig = {
+		user: process.env.OED_DB_TEST_USER || process.env.OED_DB_USER,
+		database: process.env.OED_DB_TEST_DATABASE,
+		password: process.env.OED_DB_TEST_PASSWORD || process.env.OED_DB_PASSWORD,
+		host: process.env.OED_DB_TEST_HOST || process.env.OED_DB_HOST,
+		port: process.env.OED_DB_TEST_PORT || process.env.OED_DB_PORT
+	};
+
+	stopDB();
+	testDB._connection = getDB(testDBConfig);
+	testDB.config = testDBConfig;
+	swapConnection(testDB.config, testDB._connection);
+}
+
+// The user for use by tests.
+const testUser = new User(undefined, 'test@example.invalid', bcrypt.hashSync('password', 10), User.role.ADMIN);
+testUser.password = 'password';
+
+async function recreateDB() {
+	const conn = testDB.getConnection();
+	// This should drop all database objects, as long as they were all created by the current database user
+	// They should be, since they were all created during a previous test.
+	await conn.none('DROP OWNED BY current_user;');
+	await createSchema(conn);
+	await testUser.insert(conn);
+}
+
+mocha.before(() => {
+	connectTestDB();
+});
+
+mocha.beforeEach(async () => {
+	await recreateDB();
+});
+
+mocha.after(() => {
+	dropConnection();
+});
+
+module.exports = {
+	app,
+	testUser,
+	recreateDB,
+	testDB
+};
\ No newline at end of file
diff --git a/src/server/test/db/baselineTests.js b/src/server/test/db/baselineTests.js
index 768449ab40..85dc173e6e 100644
--- a/src/server/test/db/baselineTests.js
+++ b/src/server/test/db/baselineTests.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Baseline = require('../../models/Baseline');
 const Meter = require('../../models/Meter');
 const Reading = require('../../models/Reading');
diff --git a/src/server/test/db/compareTests.js b/src/server/test/db/compareTests.js
index 03f0914bcb..40d03a897d 100644
--- a/src/server/test/db/compareTests.js
+++ b/src/server/test/db/compareTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const moment = require('moment');
 const Meter = require('../../models/Meter');
 const Reading = require('../../models/Reading');
diff --git a/src/server/test/db/configfileTests.js b/src/server/test/db/configfileTests.js
index 32addeed48..22d191e21d 100644
--- a/src/server/test/db/configfileTests.js
+++ b/src/server/test/db/configfileTests.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const md5 = require('md5');
 const moment = require('moment');
 const Configfile = require('../../models/obvius/Configfile');
diff --git a/src/server/test/db/conversionTests.js b/src/server/test/db/conversionTests.js
index 62cd23edf3..ef4b80ff9e 100644
--- a/src/server/test/db/conversionTests.js
+++ b/src/server/test/db/conversionTests.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Conversion = require('../../models/Conversion');
 const Unit = require('../../models/Unit');
 
diff --git a/src/server/test/db/cyclicGroupTests.js b/src/server/test/db/cyclicGroupTests.js
index b4cbf7faef..fb45c4dfa5 100644
--- a/src/server/test/db/cyclicGroupTests.js
+++ b/src/server/test/db/cyclicGroupTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Group = require('../../models/Group');
 
 /*
diff --git a/src/server/test/db/groupTests.js b/src/server/test/db/groupTests.js
index e1875b17eb..54efdbaab6 100644
--- a/src/server/test/db/groupTests.js
+++ b/src/server/test/db/groupTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Group = require('../../models/Group');
 const Meter = require('../../models/Meter');
 const Point = require('../../models/Point');
diff --git a/src/server/test/db/loadArrayInputTests.js b/src/server/test/db/loadArrayInputTests.js
index 9991be79e8..89f2dd2bf3 100644
--- a/src/server/test/db/loadArrayInputTests.js
+++ b/src/server/test/db/loadArrayInputTests.js
@@ -5,7 +5,8 @@
  */
 
 const moment = require('moment');
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Reading = require('../../models/Reading');
 const Meter = require('../../models/Meter');
 const loadArrayInput = require('../../services/pipeline-in-progress/loadArrayInput');
diff --git a/src/server/test/db/loadCsvInputTests.js b/src/server/test/db/loadCsvInputTests.js
index f8349c86c8..e21b46bb59 100644
--- a/src/server/test/db/loadCsvInputTests.js
+++ b/src/server/test/db/loadCsvInputTests.js
@@ -5,7 +5,8 @@
  */
 
 const moment = require('moment');
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const readCsv = require('../../services/pipeline-in-progress/readCsv');
 const Reading = require('../../models/Reading');
 const Meter = require('../../models/Meter');
diff --git a/src/server/test/db/loadLogfileToReadingsTests.js b/src/server/test/db/loadLogfileToReadingsTests.js
index 3d4c7d35f3..3da0baed40 100644
--- a/src/server/test/db/loadLogfileToReadingsTests.js
+++ b/src/server/test/db/loadLogfileToReadingsTests.js
@@ -5,7 +5,8 @@
  */
 
 const Meter = require('../../models/Meter');
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const demuxCsvWithSingleColumnTimestamps = require('../../services/obvius/csvDemux');
 const loadLogfileToReadings = require('../../services/obvius/loadLogfileToReadings');
 
diff --git a/src/server/test/db/logEmailTest.js b/src/server/test/db/logEmailTest.js
index 829c01daeb..53aba0b8f6 100644
--- a/src/server/test/db/logEmailTest.js
+++ b/src/server/test/db/logEmailTest.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const LogEmail = require('../../models/LogEmail');
 
 mocha.describe('Log Email', () => {
diff --git a/src/server/test/db/mapTests.js b/src/server/test/db/mapTests.js
index e103e85c76..9e21b27619 100644
--- a/src/server/test/db/mapTests.js
+++ b/src/server/test/db/mapTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const { Map } = require('../../models/Map');
 const Point = require('../../models/Point');
 const moment = require('moment');
diff --git a/src/server/test/db/migrations.js b/src/server/test/db/migrations.js
index 8c039ebd91..0562105395 100644
--- a/src/server/test/db/migrations.js
+++ b/src/server/test/db/migrations.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 
 const Migration = require('../../models/Migration');
 const { migrateAll } = require('../../migrations/migrateDatabase');
diff --git a/src/server/test/db/momentPatchTests.js b/src/server/test/db/momentPatchTests.js
index e45f0f286e..12b934ef78 100644
--- a/src/server/test/db/momentPatchTests.js
+++ b/src/server/test/db/momentPatchTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const moment = require('moment');
 
 mocha.describe('MomentJS patching', () => {
diff --git a/src/server/test/db/pointPatchTests.js b/src/server/test/db/pointPatchTests.js
index 2eb411916a..454910ba58 100644
--- a/src/server/test/db/pointPatchTests.js
+++ b/src/server/test/db/pointPatchTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Point = require('../../models/Point');
 
 mocha.describe('Point patching', () => {
diff --git a/src/server/test/db/readingTests.js b/src/server/test/db/readingTests.js
index 41f2b3dbfd..d50dcc406b 100644
--- a/src/server/test/db/readingTests.js
+++ b/src/server/test/db/readingTests.js
@@ -5,7 +5,8 @@
 /**
  * This class is for testing meter readings.
  */
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const moment = require('moment');
 const Meter = require('../../models/Meter');
 const Reading = require('../../models/Reading');
diff --git a/src/server/test/db/unitReadingsTests.js b/src/server/test/db/unitReadingsTests.js
index d2e823b134..9a475dcd99 100644
--- a/src/server/test/db/unitReadingsTests.js
+++ b/src/server/test/db/unitReadingsTests.js
@@ -5,7 +5,8 @@
  */
 
 const moment = require('moment');
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Meter = require('../../models/Meter');
 const Reading = require('../../models/Reading');
 const Group = require('../../models/Group');
diff --git a/src/server/test/db/unitTests.js b/src/server/test/db/unitTests.js
index d7d6476ea8..d93b0967ff 100644
--- a/src/server/test/db/unitTests.js
+++ b/src/server/test/db/unitTests.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { expectUnitToBeEquivalent, expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
 
diff --git a/src/server/test/migration/migrateDatabaseInvalidTests.js b/src/server/test/migration/migrateDatabaseInvalidTests.js
index 62343b0e12..036cb237b2 100644
--- a/src/server/test/migration/migrateDatabaseInvalidTests.js
+++ b/src/server/test/migration/migrateDatabaseInvalidTests.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB } = require('../common');
+const { mocha, expect } = require('../common');
+const { testDB } = require('../commonTestDB');
 
 const Migration = require('../../models/Migration');
 const { migrateAll } = require('../../migrations/migrateDatabase');
diff --git a/src/server/test/routes/authenticatorParamsTest.js b/src/server/test/routes/authenticatorParamsTest.js
index 820dda6566..cdde66063c 100644
--- a/src/server/test/routes/authenticatorParamsTest.js
+++ b/src/server/test/routes/authenticatorParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { validateString, testInvalidField, validateNoExtraFields } = require('../util/validationHelpers');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const { PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH, TOKEN_MAX_LENGTH, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH }
diff --git a/src/server/test/routes/baselineParamsTest.js b/src/server/test/routes/baselineParamsTest.js
index 81c637c3af..a4b1eddad8 100644
--- a/src/server/test/routes/baselineParamsTest.js
+++ b/src/server/test/routes/baselineParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
 mocha.describe('Baseline Parameter Validation', () => {
diff --git a/src/server/test/routes/ciksParamsTest.js b/src/server/test/routes/ciksParamsTest.js
index 733d9ebf45..2861becf32 100644
--- a/src/server/test/routes/ciksParamsTest.js
+++ b/src/server/test/routes/ciksParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
 mocha.describe('CIKs Parameter Validation', () => {
diff --git a/src/server/test/routes/compareReadingsParamsTest.js b/src/server/test/routes/compareReadingsParamsTest.js
index 53eda6f119..746f89271f 100644
--- a/src/server/test/routes/compareReadingsParamsTest.js
+++ b/src/server/test/routes/compareReadingsParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const {
 	validateCommaSeparatedIdPatterns,
 	expectValidCommaSeparatedIds,
diff --git a/src/server/test/routes/conversionArrayParamsTest.js b/src/server/test/routes/conversionArrayParamsTest.js
index 15b5f09488..87c7ba62ca 100644
--- a/src/server/test/routes/conversionArrayParamsTest.js
+++ b/src/server/test/routes/conversionArrayParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { testInvalidField } = require('../util/validationHelpers');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
diff --git a/src/server/test/routes/conversionsParamsTest.js b/src/server/test/routes/conversionsParamsTest.js
index 0ea121fe10..a8ed79f26b 100644
--- a/src/server/test/routes/conversionsParamsTest.js
+++ b/src/server/test/routes/conversionsParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { testInvalidField, validateInt, validateBool, validateNoExtraFields } = require('../util/validationHelpers');
 const { STRING_GENERAL_MAX_LENGTH } = require('../../util/validationConstants');
 const { HTTP_CODES } = require('../../util/httpCodes');
diff --git a/src/server/test/routes/csvParamsTest.js b/src/server/test/routes/csvParamsTest.js
index 7a5a8d8bdc..2cb70689d1 100644
--- a/src/server/test/routes/csvParamsTest.js
+++ b/src/server/test/routes/csvParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const fs = require('fs');
 const path = require('path');
 const { HTTP_CODES } = require('../../util/httpCodes');
diff --git a/src/server/test/routes/groupsParamsTest.js b/src/server/test/routes/groupsParamsTest.js
index a08b558807..9d81c11539 100644
--- a/src/server/test/routes/groupsParamsTest.js
+++ b/src/server/test/routes/groupsParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const {
 	testInvalidField,
diff --git a/src/server/test/routes/loginParamsTest.js b/src/server/test/routes/loginParamsTest.js
index 8d9e14efba..7777af709c 100644
--- a/src/server/test/routes/loginParamsTest.js
+++ b/src/server/test/routes/loginParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { validateString, testInvalidField, validateNoExtraFields } = require('../util/validationHelpers');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const {
diff --git a/src/server/test/routes/logsRouteTests.js b/src/server/test/routes/logsRouteTests.js
index ee972038ed..995f9126d4 100644
--- a/src/server/test/routes/logsRouteTests.js
+++ b/src/server/test/routes/logsRouteTests.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { chai, mocha, expect, app, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser } = require('../commonTestDB');
 const moment = require('moment');
 const { log } = require('../../log');
 const { HTTP_CODES } = require('../../util/httpCodes');
diff --git a/src/server/test/routes/mapsParamsTest.js b/src/server/test/routes/mapsParamsTest.js
index 76f227597c..a53a4f22f8 100644
--- a/src/server/test/routes/mapsParamsTest.js
+++ b/src/server/test/routes/mapsParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const {
 	testInvalidField,
 	validateNumericIdInPath,
diff --git a/src/server/test/routes/metersParamsTest.js b/src/server/test/routes/metersParamsTest.js
index 9969e8083a..3df4926298 100644
--- a/src/server/test/routes/metersParamsTest.js
+++ b/src/server/test/routes/metersParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const {
 	testInvalidField,
 	validateNoExtraFields
diff --git a/src/server/test/routes/obviusParamsTest.js b/src/server/test/routes/obviusParamsTest.js
index 7e7d3b5fda..9d11b5ed92 100644
--- a/src/server/test/routes/obviusParamsTest.js
+++ b/src/server/test/routes/obviusParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const zlib = require('zlib');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const { PASSWORD_MAX_LENGTH } = require('../../util/validationConstants');
diff --git a/src/server/test/routes/preferencesParamsTest.js b/src/server/test/routes/preferencesParamsTest.js
index 035e5fea0c..db3af071db 100644
--- a/src/server/test/routes/preferencesParamsTest.js
+++ b/src/server/test/routes/preferencesParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { testInvalidField } = require('../util/validationHelpers');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const {
diff --git a/src/server/test/routes/readingsParamsTest.js b/src/server/test/routes/readingsParamsTest.js
index fcc4008e28..abfbdad6ed 100644
--- a/src/server/test/routes/readingsParamsTest.js
+++ b/src/server/test/routes/readingsParamsTest.js
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { chai, mocha, expect, app, testDB } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testDB } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const { STRING_GENERAL_MAX_LENGTH } = require('../../util/validationConstants');
 const {
diff --git a/src/server/test/routes/responseParamsTest.js b/src/server/test/routes/responseParamsTest.js
index c403edbd0a..f9287ca4b7 100644
--- a/src/server/test/routes/responseParamsTest.js
+++ b/src/server/test/routes/responseParamsTest.js
@@ -4,8 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { mocha } = require('../common');
+const { mocha, expect } = require('../common');
 const { success, failure } = require('../../routes/response');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
diff --git a/src/server/test/routes/sessionInvalidationTest.js b/src/server/test/routes/sessionInvalidationTest.js
index ac67dad66c..3e060aede7 100644
--- a/src/server/test/routes/sessionInvalidationTest.js
+++ b/src/server/test/routes/sessionInvalidationTest.js
@@ -4,15 +4,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const common = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const bcrypt = require('bcryptjs');
 const User = require('../../models/User');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const jwt = require('jsonwebtoken');
 const secretToken = require('../../config').secretToken;
 
-const { chai, mocha, app, testUser } = common;
+//const { chai, mocha, app, testUser } = common;
 
 mocha.describe('Session Invalidation Security', () => {
 	const LOGIN_ENDPOINT = '/api/loginLogout/login';
@@ -159,7 +159,7 @@ mocha.describe('Session Invalidation Security', () => {
 		let csvUser;
 
 		mocha.beforeEach(async () => {
-			const conn = common.testDB.getConnection();
+			const conn = testDB.getConnection();
 
 			csvUser = new User(
 				undefined,
diff --git a/src/server/test/routes/unitAddParamsTest.js b/src/server/test/routes/unitAddParamsTest.js
index f2ab32596d..9a55717b50 100644
--- a/src/server/test/routes/unitAddParamsTest.js
+++ b/src/server/test/routes/unitAddParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const {
 	testInvalidField,
diff --git a/src/server/test/routes/unitEditParamsTest.js b/src/server/test/routes/unitEditParamsTest.js
index f67083b635..254637c2e2 100644
--- a/src/server/test/routes/unitEditParamsTest.js
+++ b/src/server/test/routes/unitEditParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const {
 	testInvalidField,
diff --git a/src/server/test/routes/unitsRouteTests.js b/src/server/test/routes/unitsRouteTests.js
index 358f37e9fc..4973ac024b 100644
--- a/src/server/test/routes/unitsRouteTests.js
+++ b/src/server/test/routes/unitsRouteTests.js
@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { mocha, expect, testDB, app, testUser } = require('../common');
-const chai = require('chai');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 
 mocha.describe('Units Route', () => {
diff --git a/src/server/test/routes/usersParamsTest.js b/src/server/test/routes/usersParamsTest.js
index 8bd3682cf8..c7e74a677f 100644
--- a/src/server/test/routes/usersParamsTest.js
+++ b/src/server/test/routes/usersParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { testInvalidField } = require('../util/validationHelpers');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const { PASSWORD_MAX_LENGTH, TOKEN_MAX_LENGTH, STRING_GENERAL_MAX_LENGTH } = require('../../util/validationConstants');
diff --git a/src/server/test/routes/verificationParamsTest.js b/src/server/test/routes/verificationParamsTest.js
index b6318a89d1..3e26200da8 100644
--- a/src/server/test/routes/verificationParamsTest.js
+++ b/src/server/test/routes/verificationParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { testInvalidField } = require('../util/validationHelpers');
 const { HTTP_CODES } = require('../../util/httpCodes');
 const { TOKEN_MAX_LENGTH } = require('../../util/validationConstants');
diff --git a/src/server/test/routes/versionParamsTest.js b/src/server/test/routes/versionParamsTest.js
index 98e306e714..6486f0c4b5 100644
--- a/src/server/test/routes/versionParamsTest.js
+++ b/src/server/test/routes/versionParamsTest.js
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const { chai, mocha, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
 mocha.describe('Version Parameter Validation', () => {
diff --git a/src/server/test/timeIntervalTests.js b/src/server/test/timeIntervalTests.js
index c66ce6a090..1b16a790eb 100644
--- a/src/server/test/timeIntervalTests.js
+++ b/src/server/test/timeIntervalTests.js
@@ -3,11 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const moment = require('moment');
-const mocha = require('mocha');
-const chai = require('chai');
-const chaiAsPromised = require('chai-as-promised');
-chai.use(chaiAsPromised);
-const expect = chai.expect;
+const { chai, mocha, expect } = require('./common');
 const { TimeInterval } = require('../../common/TimeInterval');
 
 
diff --git a/src/server/test/util/findMaxVersionTests.js b/src/server/test/util/findMaxVersionTests.js
index 059a64ce77..168095bd97 100644
--- a/src/server/test/util/findMaxVersionTests.js
+++ b/src/server/test/util/findMaxVersionTests.js
@@ -4,11 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const chai = require('chai');
-
-const expect = chai.expect;
-const mocha = require('mocha');
-
+const { chai, mocha, expect } = require('../common');
 const { findMaxSemanticVersion, compareSemanticVersion } = require('../../util');
 
 mocha.describe('compareTwoSemanticVersion', () => {
diff --git a/src/server/test/util/mapToObjectTests.js b/src/server/test/util/mapToObjectTests.js
index 3250fea7fa..932398382b 100644
--- a/src/server/test/util/mapToObjectTests.js
+++ b/src/server/test/util/mapToObjectTests.js
@@ -4,11 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const chai = require('chai');
-
-const expect = chai.expect;
-const mocha = require('mocha');
-
+const { chai, mocha, expect } = require('../common');
 const { mapToObject } = require('../../util');
 
 
diff --git a/src/server/test/util/timeValidationTests.js b/src/server/test/util/timeValidationTests.js
index 7b616da2bc..9dba59a323 100644
--- a/src/server/test/util/timeValidationTests.js
+++ b/src/server/test/util/timeValidationTests.js
@@ -4,8 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const mocha = require('mocha');
+const { expect, mocha } = require('../common');
 const { isValidIsoDateTime, isValidIsoDuration, isValidTimeInterval } = require('../../util/timeValidation');
 
 mocha.describe('timeValidation utility', () => {
diff --git a/src/server/test/util/validationHelpers.js b/src/server/test/util/validationHelpers.js
index 44f301092f..3240d08e9c 100644
--- a/src/server/test/util/validationHelpers.js
+++ b/src/server/test/util/validationHelpers.js
@@ -4,13 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const { expect } = require('chai');
-const chaiHttp = require('chai-http');
-const { chai, app } = require('../common');
+const { chai, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
-chai.use(chaiHttp);
-
 /**
  * Sends a POST request to the specified API endpoint with a test payload,
  * setting the given field to an invalid value or removing it entirely
diff --git a/src/server/test/web/csvPipelineTest.js b/src/server/test/web/csvPipelineTest.js
index 5c18c6a739..bc6080e219 100644
--- a/src/server/test/web/csvPipelineTest.js
+++ b/src/server/test/web/csvPipelineTest.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { chai, mocha, expect, app, testDB, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const Meter = require('../../models/Meter');
 const Reading = require('../../models/Reading');
 const Point = require('../../models/Point');
diff --git a/src/server/test/web/groups.js b/src/server/test/web/groups.js
index 548d388506..d141e8cbd5 100644
--- a/src/server/test/web/groups.js
+++ b/src/server/test/web/groups.js
@@ -4,7 +4,8 @@
 
 /* This file tests the groups API. */
 
-const { chai, mocha, expect, app, testUser, testDB, recreateDB } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB, recreateDB } = require('../commonTestDB');
 const bcrypt = require('bcryptjs');
 const Group = require('../../models/Group');
 const Meter = require('../../models/Meter');
diff --git a/src/server/test/web/login.js b/src/server/test/web/login.js
index 88018a995c..0b79a3f62a 100644
--- a/src/server/test/web/login.js
+++ b/src/server/test/web/login.js
@@ -4,7 +4,8 @@
 
 /* This file tests the login form API. */
 
-const { chai, mocha, expect, app, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
 const VERSION = require('../../version');
diff --git a/src/server/test/web/maps.js b/src/server/test/web/maps.js
index 7aa75ea595..d4ea169eaf 100644
--- a/src/server/test/web/maps.js
+++ b/src/server/test/web/maps.js
@@ -5,7 +5,8 @@
 /* This file tests the API for retrieving meters, by artificially
  * inserting meters prior to executing the test code. */
 
-const { chai, mocha, expect, app, testDB, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const { Map } = require('../../models/Map');
 const User = require('../../models/User');
 const bcrypt = require('bcryptjs');
diff --git a/src/server/test/web/meters.js b/src/server/test/web/meters.js
index 814b92b517..cd5a03e2ea 100644
--- a/src/server/test/web/meters.js
+++ b/src/server/test/web/meters.js
@@ -5,7 +5,8 @@
 /* This file tests the API for retrieving meters, by artificially
  * inserting meters prior to executing the test code. */
 
-const { chai, mocha, expect, app, testDB, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const Meter = require('../../models/Meter');
 const User = require('../../models/User');
 const bcrypt = require('bcryptjs');
diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 95db9ae432..91ab4bdfa9 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -5,7 +5,8 @@
 /* This file tests the API for retrieving meters, by artificially
  * inserting meters prior to executing the test code. */
 
-const { chai, mocha, expect, app, testDB, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const User = require('../../models/User');
 const Configfile = require('../../models/obvius/Configfile');
 const bcrypt = require('bcryptjs');
diff --git a/src/server/test/web/preferencesTest.js b/src/server/test/web/preferencesTest.js
index 524dd07d53..6d4c592584 100644
--- a/src/server/test/web/preferencesTest.js
+++ b/src/server/test/web/preferencesTest.js
@@ -5,7 +5,8 @@
 /* This file tests the API for retrieving meters, by artificially
  * inserting meters prior to executing the test code. */
 
-const { chai, mocha, expect, app, testDB, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const User = require('../../models/User');
 const bcrypt = require('bcryptjs');
 const { HTTP_CODES } = require('../../util/httpCodes');
diff --git a/src/server/test/web/readingsBarGroupBasic.js b/src/server/test/web/readingsBarGroupBasic.js
index 435da8a9e9..d542e3c811 100644
--- a/src/server/test/web/readingsBarGroupBasic.js
+++ b/src/server/test/web/readingsBarGroupBasic.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { prepareTest,
     getUnitId,
     ETERNITY,
diff --git a/src/server/test/web/readingsBarGroupFlow.js b/src/server/test/web/readingsBarGroupFlow.js
index 12e0ac1e41..d73e294bd1 100644
--- a/src/server/test/web/readingsBarGroupFlow.js
+++ b/src/server/test/web/readingsBarGroupFlow.js
@@ -7,7 +7,8 @@
 	See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
 	parseExpectedCsv,
diff --git a/src/server/test/web/readingsBarGroupQuantity.js b/src/server/test/web/readingsBarGroupQuantity.js
index 34edf65df9..f5febdd7f4 100644
--- a/src/server/test/web/readingsBarGroupQuantity.js
+++ b/src/server/test/web/readingsBarGroupQuantity.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsBarMeterBasic.js b/src/server/test/web/readingsBarMeterBasic.js
index 9f8ffe688a..0bd1673023 100644
--- a/src/server/test/web/readingsBarMeterBasic.js
+++ b/src/server/test/web/readingsBarMeterBasic.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { prepareTest,
     getUnitId,
     ETERNITY,
diff --git a/src/server/test/web/readingsBarMeterFlow.js b/src/server/test/web/readingsBarMeterFlow.js
index a9fea8b9cb..57920c2497 100644
--- a/src/server/test/web/readingsBarMeterFlow.js
+++ b/src/server/test/web/readingsBarMeterFlow.js
@@ -8,7 +8,8 @@
 	See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const {
 	prepareTest,
diff --git a/src/server/test/web/readingsBarMeterQuantity.js b/src/server/test/web/readingsBarMeterQuantity.js
index 5c01112aab..0ff3acd54b 100644
--- a/src/server/test/web/readingsBarMeterQuantity.js
+++ b/src/server/test/web/readingsBarMeterQuantity.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsCompareGroupFlow.js b/src/server/test/web/readingsCompareGroupFlow.js
index 57ad990231..13a4cc75b6 100644
--- a/src/server/test/web/readingsCompareGroupFlow.js
+++ b/src/server/test/web/readingsCompareGroupFlow.js
@@ -6,7 +6,8 @@
 	This file tests the readings retrieval API compare chart meters.
 	See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
 	expectCompareToEqualExpected,
diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index e2a2aa143a..efc3aa1a19 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -6,7 +6,8 @@
 	This file tests the readings retrieval API compare chart meters.
 	See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
 	expectCompareToEqualExpected,
diff --git a/src/server/test/web/readingsCompareMeterFlow.js b/src/server/test/web/readingsCompareMeterFlow.js
index 354a7bca54..df0f7ae3ec 100644
--- a/src/server/test/web/readingsCompareMeterFlow.js
+++ b/src/server/test/web/readingsCompareMeterFlow.js
@@ -6,7 +6,8 @@
 	This file tests the readings retrieval API compare chart meters.
 	See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
 	expectCompareToEqualExpected,
diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index d5652eb207..f40ba3168f 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -6,7 +6,8 @@
 	This file tests the readings retrieval API compare chart meters.
 	See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
 	expectCompareToEqualExpected,
diff --git a/src/server/test/web/readingsLineGroupBasic.js b/src/server/test/web/readingsLineGroupBasic.js
index 64982d1697..77208cf3cc 100644
--- a/src/server/test/web/readingsLineGroupBasic.js
+++ b/src/server/test/web/readingsLineGroupBasic.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { prepareTest,
     getUnitId,
     ETERNITY,
diff --git a/src/server/test/web/readingsLineGroupFlow.js b/src/server/test/web/readingsLineGroupFlow.js
index cd86e33525..a06b8ec458 100644
--- a/src/server/test/web/readingsLineGroupFlow.js
+++ b/src/server/test/web/readingsLineGroupFlow.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsLineGroupQuantity.js b/src/server/test/web/readingsLineGroupQuantity.js
index b16abe53ba..0b94bdcb86 100644
--- a/src/server/test/web/readingsLineGroupQuantity.js
+++ b/src/server/test/web/readingsLineGroupQuantity.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsLineMeterBasic.js b/src/server/test/web/readingsLineMeterBasic.js
index 1e0c94697b..4e6743c521 100644
--- a/src/server/test/web/readingsLineMeterBasic.js
+++ b/src/server/test/web/readingsLineMeterBasic.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     getUnitId,
diff --git a/src/server/test/web/readingsLineMeterFlow.js b/src/server/test/web/readingsLineMeterFlow.js
index 0f085da0cf..47e82ea5c4 100644
--- a/src/server/test/web/readingsLineMeterFlow.js
+++ b/src/server/test/web/readingsLineMeterFlow.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsLineMeterQuantity.js b/src/server/test/web/readingsLineMeterQuantity.js
index 0448836e2e..059b927e44 100644
--- a/src/server/test/web/readingsLineMeterQuantity.js
+++ b/src/server/test/web/readingsLineMeterQuantity.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsLineMeterRangeFlow.js b/src/server/test/web/readingsLineMeterRangeFlow.js
index 995a775838..1c977a3d92 100644
--- a/src/server/test/web/readingsLineMeterRangeFlow.js
+++ b/src/server/test/web/readingsLineMeterRangeFlow.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsLineMeterRangeQuantity.js b/src/server/test/web/readingsLineMeterRangeQuantity.js
index 501d262e9b..29d27b9179 100644
--- a/src/server/test/web/readingsLineMeterRangeQuantity.js
+++ b/src/server/test/web/readingsLineMeterRangeQuantity.js
@@ -7,7 +7,8 @@
   See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const {
 	prepareTest,
diff --git a/src/server/test/web/readingsLineMeterRangeRaw.js b/src/server/test/web/readingsLineMeterRangeRaw.js
index 764d7c95d8..8beb20a6bf 100644
--- a/src/server/test/web/readingsLineMeterRangeRaw.js
+++ b/src/server/test/web/readingsLineMeterRangeRaw.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsLineMeterRaw.js b/src/server/test/web/readingsLineMeterRaw.js
index af0d0baab4..eb8c60fb87 100644
--- a/src/server/test/web/readingsLineMeterRaw.js
+++ b/src/server/test/web/readingsLineMeterRaw.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsRejection.js b/src/server/test/web/readingsRejection.js
index 37b35ed6e1..9cfd5a7d07 100644
--- a/src/server/test/web/readingsRejection.js
+++ b/src/server/test/web/readingsRejection.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { createTimeString,
     ETERNITY,
     METER_ID,
diff --git a/src/server/test/web/readingsThreeDGroupBasic.js b/src/server/test/web/readingsThreeDGroupBasic.js
index 778fb138b4..0626df3637 100644
--- a/src/server/test/web/readingsThreeDGroupBasic.js
+++ b/src/server/test/web/readingsThreeDGroupBasic.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { prepareTest,
     createTimeString,
     getUnitId,
diff --git a/src/server/test/web/readingsThreeDGroupFlow.js b/src/server/test/web/readingsThreeDGroupFlow.js
index 18961855ac..6b26f76b9e 100644
--- a/src/server/test/web/readingsThreeDGroupFlow.js
+++ b/src/server/test/web/readingsThreeDGroupFlow.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsThreeDGroupQuantity.js b/src/server/test/web/readingsThreeDGroupQuantity.js
index 725aad100d..7558711b61 100644
--- a/src/server/test/web/readingsThreeDGroupQuantity.js
+++ b/src/server/test/web/readingsThreeDGroupQuantity.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsThreeDGroupRaw.js b/src/server/test/web/readingsThreeDGroupRaw.js
index 1210cc645d..5fe55da75e 100644
--- a/src/server/test/web/readingsThreeDGroupRaw.js
+++ b/src/server/test/web/readingsThreeDGroupRaw.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsThreeDMeterBasic.js b/src/server/test/web/readingsThreeDMeterBasic.js
index f1cb449905..67ab30ceb5 100644
--- a/src/server/test/web/readingsThreeDMeterBasic.js
+++ b/src/server/test/web/readingsThreeDMeterBasic.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { prepareTest,
     createTimeString,
     getUnitId,
diff --git a/src/server/test/web/readingsThreeDMeterFlow.js b/src/server/test/web/readingsThreeDMeterFlow.js
index bd5fee2898..b2dc9c9739 100644
--- a/src/server/test/web/readingsThreeDMeterFlow.js
+++ b/src/server/test/web/readingsThreeDMeterFlow.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsThreeDMeterQuantity.js b/src/server/test/web/readingsThreeDMeterQuantity.js
index 03ef036070..57feca5bfb 100644
--- a/src/server/test/web/readingsThreeDMeterQuantity.js
+++ b/src/server/test/web/readingsThreeDMeterQuantity.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/readingsThreeDMeterRaw.js b/src/server/test/web/readingsThreeDMeterRaw.js
index 421ba03466..5d863dd23c 100644
--- a/src/server/test/web/readingsThreeDMeterRaw.js
+++ b/src/server/test/web/readingsThreeDMeterRaw.js
@@ -7,7 +7,8 @@
     See: https://github.com/OpenEnergyDashboard/DesignDocs/blob/main/testing/testing.md for information.
 */
 
-const { chai, mocha, app } = require('../common');
+const { chai, mocha } = require('../common');
+const { app } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { prepareTest,
     parseExpectedCsv,
diff --git a/src/server/test/web/unitsTest.js b/src/server/test/web/unitsTest.js
index 1ce5eeac5a..8db0c2f825 100644
--- a/src/server/test/web/unitsTest.js
+++ b/src/server/test/web/unitsTest.js
@@ -5,7 +5,8 @@
 /* This file tests the API for retrieving units, by artificially
  * inserting units prior to executing the test code. */
 
-const { chai, mocha, expect, app, testDB, testUser } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB } = require('../commonTestDB');
 const Unit = require('../../models/Unit');
 const { expectUnitToBeEquivalent, expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
 const { HTTP_CODES } = require('../../util/httpCodes');
diff --git a/src/server/test/web/usersTest.js b/src/server/test/web/usersTest.js
index 328c46167c..a37816036e 100644
--- a/src/server/test/web/usersTest.js
+++ b/src/server/test/web/usersTest.js
@@ -5,7 +5,8 @@
 /* This file tests the API for retrieving meters, by artificially
  * inserting meters prior to executing the test code. */
 
-const { chai, mocha, expect, app, testDB, testUser, recreateDB } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app, testUser, testDB, recreateDB } = require('../commonTestDB');
 const User = require('../../models/User');
 const bcrypt = require('bcryptjs');
 const { HTTP_CODES } = require('../../util/httpCodes');
diff --git a/src/server/test/web/version.js b/src/server/test/web/version.js
index 0bdb985304..cccebe5ddf 100644
--- a/src/server/test/web/version.js
+++ b/src/server/test/web/version.js
@@ -5,7 +5,8 @@
 /* This file tests the trivial version API.
  * It may be used as a template for future tests. */
 
-const { chai, mocha, expect, app } = require('../common');
+const { chai, mocha, expect } = require('../common');
+const { app } = require('../commonTestDB');
 const { HTTP_CODES } = require('../../util/httpCodes');
 
 const VERSION = require('../../version');
diff --git a/src/server/util/readingsUtils.js b/src/server/util/readingsUtils.js
index d95188c3ee..5a32dda6bf 100644
--- a/src/server/util/readingsUtils.js
+++ b/src/server/util/readingsUtils.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { expect, testDB } = require('../test/common');
+const { expect } = require('../test/common');
+const { testDB } = require('../test/commonTestDB');
 const { TimeInterval } = require('../../common/TimeInterval');
 const { insertUnits, insertConversions, insertMeters, insertGroups } = require('./insertData');
 const Unit = require('../models/Unit');