diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js
index c6c34b7eb..933da41ea 100644
--- a/Server/controllers/maintenanceWindowController.js
+++ b/Server/controllers/maintenanceWindowController.js
@@ -84,7 +84,7 @@ const getMaintenanceWindowsByTeamId = async (req, res, next) => {
       req.query
     );
 
-    return res.status(201).json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MAINTENANCE_WINDOW_GET_BY_TEAM,
       data: maintenanceWindows,
@@ -109,7 +109,7 @@ const getMaintenanceWindowsByMonitorId = async (req, res, next) => {
       req.params.monitorId
     );
 
-    return res.status(201).json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MAINTENANCE_WINDOW_GET_BY_USER,
       data: maintenanceWindows,
@@ -128,7 +128,7 @@ const deleteMaintenanceWindow = async (req, res, next) => {
   }
   try {
     await req.db.deleteMaintenanceWindowById(req.params.id);
-    return res.status(201).json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MAINTENANCE_WINDOW_DELETE,
     });
diff --git a/Server/tests/controllers/maintenanceWindowController.test.js b/Server/tests/controllers/maintenanceWindowController.test.js
new file mode 100644
index 000000000..5bc3a906e
--- /dev/null
+++ b/Server/tests/controllers/maintenanceWindowController.test.js
@@ -0,0 +1,410 @@
+const {
+  createMaintenanceWindows,
+  getMaintenanceWindowById,
+  getMaintenanceWindowsByTeamId,
+  getMaintenanceWindowsByMonitorId,
+  deleteMaintenanceWindow,
+  editMaintenanceWindow,
+} = require("../../controllers/maintenanceWindowController");
+
+const jwt = require("jsonwebtoken");
+const { errorMessages, successMessages } = require("../../utils/messages");
+const sinon = require("sinon");
+
+describe("maintenanceWindowController - createMaintenanceWindows", () => {
+  beforeEach(() => {
+    req = {
+      body: {
+        monitors: ["66ff52e7c5911c61698ac724"],
+        name: "window",
+        active: true,
+        start: "2024-10-11T05:27:13.747Z",
+        end: "2024-10-11T05:27:14.747Z",
+        repeat: "123",
+      },
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        createMaintenanceWindow: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it("should reject with an error if body validation fails", async () => {
+    stub = sinon.stub(jwt, "verify").callsFake(() => {
+      return { teamId: "123" };
+    });
+    req.body = {};
+    await createMaintenanceWindows(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+    stub.restore();
+  });
+
+  it("should reject with an error if jwt.verify fails", async () => {
+    stub = sinon.stub(jwt, "verify").throws(new jwt.JsonWebTokenError());
+    await createMaintenanceWindows(req, res, next);
+    expect(next.firstCall.args[0]).to.be.instanceOf(jwt.JsonWebTokenError);
+    stub.restore();
+  });
+
+  it("should reject with an error DB operations fail", async () => {
+    stub = sinon.stub(jwt, "verify").callsFake(() => {
+      return { teamId: "123" };
+    });
+    req.db.createMaintenanceWindow.throws(new Error("DB error"));
+    await createMaintenanceWindows(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+    stub.restore();
+  });
+  it("should return success message if all operations are successful", async () => {
+    stub = sinon.stub(jwt, "verify").callsFake(() => {
+      return { teamId: "123" };
+    });
+    await createMaintenanceWindows(req, res, next);
+    expect(res.status.firstCall.args[0]).to.equal(201);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_CREATE,
+      })
+    ).to.be.true;
+    stub.restore();
+  });
+  it("should return success message if all operations are successful with active set to undefined", async () => {
+    req.body.active = undefined;
+    stub = sinon.stub(jwt, "verify").callsFake(() => {
+      return { teamId: "123" };
+    });
+    await createMaintenanceWindows(req, res, next);
+    expect(res.status.firstCall.args[0]).to.equal(201);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_CREATE,
+      })
+    ).to.be.true;
+    stub.restore();
+  });
+});
+
+describe("maintenanceWindowController - getMaintenanceWindowById", () => {
+  beforeEach(() => {
+    req = {
+      body: {},
+      params: {
+        id: "123",
+      },
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        getMaintenanceWindowById: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+
+  it("should reject if param validation fails", async () => {
+    req.params = {};
+    await getMaintenanceWindowById(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+
+  it("should reject if DB operations fail", async () => {
+    req.db.getMaintenanceWindowById.throws(new Error("DB error"));
+    await getMaintenanceWindowById(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+  });
+  it("should return success message with data if all operations are successful", async () => {
+    req.db.getMaintenanceWindowById.returns({ id: "123" });
+    await getMaintenanceWindowById(req, res, next);
+    expect(res.status.firstCall.args[0]).to.equal(200);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_GET_BY_ID,
+        data: { id: "123" },
+      })
+    ).to.be.true;
+  });
+});
+
+describe("maintenanceWindowController - getMaintenanceWindowsByTeamId", () => {
+  beforeEach(() => {
+    req = {
+      body: {},
+      params: {},
+      query: {},
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        getMaintenanceWindowsByTeamId: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+  it("should reject if query validation fails", async () => {
+    req.query = {
+      invalid: 1,
+    };
+    await getMaintenanceWindowsByTeamId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+  it("should reject if jwt.verify fails", async () => {
+    stub = sinon.stub(jwt, "verify").throws(new jwt.JsonWebTokenError());
+    await getMaintenanceWindowsByTeamId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.instanceOf(jwt.JsonWebTokenError);
+    stub.restore();
+  });
+
+  it("should reject with an error if DB operations fail", async () => {
+    stub = sinon.stub(jwt, "verify").callsFake(() => {
+      return { teamId: "123" };
+    });
+    req.db.getMaintenanceWindowsByTeamId.throws(new Error("DB error"));
+    await getMaintenanceWindowsByTeamId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+    stub.restore();
+  });
+
+  it("should return success message with data if all operations are successful", async () => {
+    stub = sinon.stub(jwt, "verify").callsFake(() => {
+      return { teamId: "123" };
+    });
+    req.db.getMaintenanceWindowsByTeamId.returns([{ id: "123" }]);
+    await getMaintenanceWindowsByTeamId(req, res, next);
+    expect(res.status.firstCall.args[0]).to.equal(200);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_GET_BY_TEAM,
+        data: [{ id: jwt.verify().teamId }],
+      })
+    ).to.be.true;
+    stub.restore();
+  });
+});
+
+describe("maintenanceWindowController - getMaintenanceWindowsByMonitorId", () => {
+  beforeEach(() => {
+    req = {
+      body: {},
+      params: {
+        monitorId: "123",
+      },
+      query: {},
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        getMaintenanceWindowsByMonitorId: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it("should reject if param validation fails", async () => {
+    req.params = {};
+    await getMaintenanceWindowsByMonitorId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+
+  it("should reject with an error if DB operations fail", async () => {
+    req.db.getMaintenanceWindowsByMonitorId.throws(new Error("DB error"));
+    await getMaintenanceWindowsByMonitorId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+  });
+
+  it("should return success message with data if all operations are successful", async () => {
+    const data = [{ monitorId: "123" }];
+    req.db.getMaintenanceWindowsByMonitorId.returns(data);
+    await getMaintenanceWindowsByMonitorId(req, res, next);
+    expect(
+      req.db.getMaintenanceWindowsByMonitorId.calledOnceWith(
+        req.params.monitorId
+      )
+    );
+    expect(res.status.firstCall.args[0]).to.equal(200);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_GET_BY_MONITOR,
+        data: data,
+      })
+    ).to.be.true;
+  });
+});
+
+describe("maintenanceWindowController - deleteMaintenanceWindow", () => {
+  beforeEach(() => {
+    req = {
+      body: {},
+      params: {
+        id: "123",
+      },
+      query: {},
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        deleteMaintenanceWindowById: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it("should reject if param validation fails", async () => {
+    req.params = {};
+    await deleteMaintenanceWindow(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+
+  it("should reject with an error if DB operations fail", async () => {
+    req.db.deleteMaintenanceWindowById.throws(new Error("DB error"));
+    await deleteMaintenanceWindow(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+  });
+
+  it("should return success message if all operations are successful", async () => {
+    await deleteMaintenanceWindow(req, res, next);
+    expect(req.db.deleteMaintenanceWindowById.calledOnceWith(req.params.id));
+    expect(res.status.firstCall.args[0]).to.equal(200);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_DELETE,
+      })
+    ).to.be.true;
+  });
+});
+
+describe("maintenanceWindowController - editMaintenanceWindow", () => {
+  beforeEach(() => {
+    req = {
+      body: {
+        active: true,
+        name: "test",
+      },
+      params: {
+        id: "123",
+      },
+      query: {},
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        editMaintenanceWindowById: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it("should reject if param validation fails", async () => {
+    req.params = {};
+    await editMaintenanceWindow(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+
+  it("should reject if body validation fails", async () => {
+    req.body = { invalid: 1 };
+    await editMaintenanceWindow(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+
+  it("should reject with an error if DB operations fail", async () => {
+    req.db.editMaintenanceWindowById.throws(new Error("DB error"));
+    await editMaintenanceWindow(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+  });
+
+  it("should return success message with data if all operations are successful", async () => {
+    const data = { id: "123" };
+    req.db.editMaintenanceWindowById.returns(data);
+
+    await editMaintenanceWindow(req, res, next);
+    expect(
+      req.db.editMaintenanceWindowById.calledOnceWith(req.params.id, req.body)
+    );
+    expect(res.status.firstCall.args[0]).to.equal(200);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_EDIT,
+        data: data,
+      })
+    ).to.be.true;
+  });
+});