diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js
index c6c34b7eb..9706b4222 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,
diff --git a/Server/tests/controllers/maintenanceWindowController.test.js b/Server/tests/controllers/maintenanceWindowController.test.js
index 950597581..a133ec98d 100644
--- a/Server/tests/controllers/maintenanceWindowController.test.js
+++ b/Server/tests/controllers/maintenanceWindowController.test.js
@@ -83,6 +83,7 @@ describe("maintenanceWindowController - createMaintenanceWindows", () => {
         msg: successMessages.MAINTENANCE_WINDOW_CREATE,
       })
     ).to.be.true;
+    stub.restore();
   });
 });
 
@@ -123,5 +124,82 @@ describe("maintenanceWindowController - getMaintenanceWindowById", () => {
     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 () => {});
+  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();
+  });
 });