diff --git a/Docker/test/cerbot-compose.yaml b/Docker/test/cerbot-compose.yaml
new file mode 100644
index 000000000..9220d07a1
--- /dev/null
+++ b/Docker/test/cerbot-compose.yaml
@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+  webserver:
+    image: nginx:latest
+    ports:
+      - 80:80
+      - 443:443
+    restart: always
+    volumes:
+      - ./nginx/conf.d/:/etc/nginx/conf.d/:ro
+      - ./certbot/www/:/var/www/certbot/:ro
+  certbot:
+    image: certbot/certbot:latest
+    volumes:
+      - ./certbot/www/:/var/www/certbot/:rw
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    depends_on:
+      - webserver
diff --git a/Server/db/mongo/modules/hardwareCheckModule.js b/Server/db/mongo/modules/hardwareCheckModule.js
index 00b2c1c07..3eab0dfb9 100644
--- a/Server/db/mongo/modules/hardwareCheckModule.js
+++ b/Server/db/mongo/modules/hardwareCheckModule.js
@@ -1,5 +1,6 @@
 import HardwareCheck from "../../models/HardwareCheck.js";
 import Monitor from "../../models/Monitor.js";
+import logger from "../../../utils/logger.js";
 
 const SERVICE_NAME = "hardwareCheckModule";
 const createHardwareCheck = async (hardwareCheckData) => {
@@ -15,6 +16,7 @@ const createHardwareCheck = async (hardwareCheckData) => {
 				method: "createHardwareCheck",
 				details: `monitor ID: ${monitorId}`,
 			});
+			return null;
 		}
 
 		if (monitor.uptimePercentage === undefined) {
diff --git a/Server/tests/db/hardwareCheckModule.test.js b/Server/tests/db/hardwareCheckModule.test.js
index 530f5f4f8..df16441b2 100644
--- a/Server/tests/db/hardwareCheckModule.test.js
+++ b/Server/tests/db/hardwareCheckModule.test.js
@@ -1,6 +1,8 @@
 import sinon from "sinon";
 import HardwareCheck from "../../db/models/HardwareCheck.js";
 import { createHardwareCheck } from "../../db/mongo/modules/hardwareCheckModule.js";
+import Monitor from "../../db/models/Monitor.js";
+import logger from "../../utils/logger.js";
 
 const mockHardwareCheck = {
 	data: {
@@ -42,10 +44,23 @@ const mockHardwareCheck = {
 	],
 };
 
+const mockMonitor = {
+	_id: "123",
+	uptimePercentage: 1,
+	status: true,
+	save: () => this,
+};
+
 describe("HardwareCheckModule", () => {
-	let hardwareCheckSaveStub;
+	let hardwareCheckSaveStub,
+		hardwareCheckCountDocumentsStub,
+		monitorFindByIdStub,
+		loggerStub;
 	beforeEach(() => {
+		loggerStub = sinon.stub(logger, "error");
 		hardwareCheckSaveStub = sinon.stub(HardwareCheck.prototype, "save");
+		monitorFindByIdStub = sinon.stub(Monitor, "findById");
+		hardwareCheckCountDocumentsStub = sinon.stub(HardwareCheck, "countDocuments");
 	});
 
 	afterEach(() => {
@@ -55,12 +70,23 @@ describe("HardwareCheckModule", () => {
 	describe("createHardwareCheck", () => {
 		it("should return a hardware check", async () => {
 			hardwareCheckSaveStub.resolves(mockHardwareCheck);
-			const hardwareCheck = await createHardwareCheck({});
+			monitorFindByIdStub.resolves(mockMonitor);
+			hardwareCheckCountDocumentsStub.resolves(1);
+			const hardwareCheck = await createHardwareCheck({ status: true });
+			expect(hardwareCheck).to.exist;
+			expect(hardwareCheck).to.deep.equal(mockHardwareCheck);
+		});
+		it("should return a hardware check for a check with status false", async () => {
+			hardwareCheckSaveStub.resolves(mockHardwareCheck);
+			monitorFindByIdStub.resolves(mockMonitor);
+			hardwareCheckCountDocumentsStub.resolves(1);
+			const hardwareCheck = await createHardwareCheck({ status: false });
 			expect(hardwareCheck).to.exist;
 			expect(hardwareCheck).to.deep.equal(mockHardwareCheck);
 		});
 		it("should handle an error", async () => {
 			const err = new Error("test error");
+			monitorFindByIdStub.resolves(mockMonitor);
 			hardwareCheckSaveStub.rejects(err);
 			try {
 				await createHardwareCheck({});
@@ -69,5 +95,38 @@ describe("HardwareCheckModule", () => {
 				expect(error).to.deep.equal(err);
 			}
 		});
+		it("should log an error if a monitor is not found", async () => {
+			monitorFindByIdStub.resolves(null);
+			const res = await createHardwareCheck({});
+			expect(loggerStub.calledOnce).to.be.true;
+			expect(res).to.be.null;
+		});
+		it("should handle a monitor with undefined uptimePercentage", async () => {
+			monitorFindByIdStub.resolves({ ...mockMonitor, uptimePercentage: undefined });
+			hardwareCheckSaveStub.resolves(mockHardwareCheck);
+			hardwareCheckCountDocumentsStub.resolves(1);
+			const res = await createHardwareCheck({});
+			expect(res).to.exist;
+		});
+		it("should handle a monitor with undefined uptimePercentage and true status", async () => {
+			monitorFindByIdStub.resolves({
+				...mockMonitor,
+				uptimePercentage: undefined,
+			});
+			hardwareCheckSaveStub.resolves(mockHardwareCheck);
+			hardwareCheckCountDocumentsStub.resolves(1);
+			const res = await createHardwareCheck({ status: true });
+			expect(res).to.exist;
+		});
+		it("should handle a monitor with undefined uptimePercentage and false status", async () => {
+			monitorFindByIdStub.resolves({
+				...mockMonitor,
+				uptimePercentage: undefined,
+			});
+			hardwareCheckSaveStub.resolves(mockHardwareCheck);
+			hardwareCheckCountDocumentsStub.resolves(1);
+			const res = await createHardwareCheck({ status: false });
+			expect(res).to.exist;
+		});
 	});
 });