diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..4cd3353
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,12 @@
+# MongoDB connection string
+MONGO_DB_URL=
+
+# Secret key for JWT token signing
+TOKEN_SECRET=
+
+# SMTP configuration for sending emails
+SMTP_USER=
+SMTP_PASS=
+
+# Domain URL for email verification links
+domain=http://localhost:3000
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index aeaa18b..cb1a45c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -20,7 +20,7 @@ jobs:
         run: npm install
 
       - name: Run tests
-        run: npx jest --coverage --reporters=jest-junit
+        run: npx jest --coverage --reporters=default --reporters=jest-junit --verbose
 
       - name: Upload results to Codecov
         uses: codecov/codecov-action@v5
diff --git a/.gitignore b/.gitignore
index 5ef6a52..5887273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 
 # testing
 /coverage
+junit.xml
 
 # next.js
 /.next/
@@ -31,7 +32,7 @@ yarn-error.log*
 .pnpm-debug.log*
 
 # env files (can opt-in for committing if needed)
-.env*
+.env
 
 # vercel
 .vercel
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index daeb7eb..a12728c 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -25,6 +25,7 @@ interface Device {
   color: string; // Named color
   brightness: number;
   powered: boolean;
+  connected?: boolean; // Connection status
 }
 
 interface User {
@@ -40,7 +41,7 @@ export default function Dashboard() {
   const [devices, setDevices] = useState<Device[]>([]);
   const [selectedDeviceId, setSelectedDeviceId] = useState<string>("");
   const [selectedDevice, setSelectedDevice] = useState<Device | null>(null);
-  const [editValues, setEditValues] = useState<Omit<Device, "_id">>({
+  const [editValues, setEditValues] = useState<Omit<Device, "_id" | "connected">>({
     name: "",
     color: colors[0].name,
     brightness: 100,
@@ -293,6 +294,14 @@ const colorsList = useMemo(() => colors, []);
 
             {selectedDevice && (
               <div className="mt-6 bg-blue-100 p-4 text-left rounded-lg shadow">
+                {/* Connection Status */}
+                <div className="flex items-center gap-2 mb-4 pb-3 border-b border-gray-300">
+                  <div className={`w-3 h-3 rounded-full ${selectedDevice.connected ? 'bg-green-500' : 'bg-red-500'}`} />
+                  <span className="text-sm font-semibold">
+                    {selectedDevice.connected ? 'Connected' : 'Disconnected'}
+                  </span>
+                </div>
+
                 {/* Device Name */}
                 <label className="block mb-2">Name</label>
                 <input
diff --git a/package-lock.json b/package-lock.json
index 47e0c0b..6f71fa1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -104,6 +104,7 @@
       "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
@@ -2329,6 +2330,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.2.tgz",
       "integrity": "sha512-USU8ZI/xyKJwFTpjSVIrSeHBVAGagkHQKPNbxeWwql/vDmnTIBgx+TJnhFnj1NXgz8XfprU0egV2dROLGpsBEg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -2439,6 +2441,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
       "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.18.1",
         "@typescript-eslint/types": "8.18.1",
@@ -2986,6 +2989,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3529,6 +3533,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001737",
         "electron-to-chromium": "^1.5.211",
@@ -4524,6 +4529,7 @@
       "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -4720,6 +4726,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
       "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.8",
@@ -6326,6 +6333,7 @@
       "integrity": "sha512-Ry+p2+NLk6u8Agh5yVqELfUJvRfV51hhVBRIB5yZPY7mU0DGBmOuFG5GebZbMbm86cdQNK0fhJuDX8/1YorISQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/core": "30.1.3",
         "@jest/types": "30.0.5",
@@ -6977,6 +6985,7 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
+      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -8260,6 +8269,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.1.1",
@@ -8510,6 +8520,7 @@
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
       "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8528,6 +8539,7 @@
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
       "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.25.0"
       },
@@ -9892,6 +9904,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
       "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "dev": true,
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/tests/account/account.api.test.ts b/tests/account/account.api.test.ts
index 836d140..7600f16 100644
--- a/tests/account/account.api.test.ts
+++ b/tests/account/account.api.test.ts
@@ -4,6 +4,11 @@ jest.mock("@/dbConfig", () => ({
   disconnect: async () => {},   // no-op
 }));
 
+// ✅ Mock sendEmail to prevent actual email sending in tests
+jest.mock("@/app/helpers/mailer", () => ({
+  sendEmail: jest.fn().mockResolvedValue(true),
+}));
+
 import User from "@/server/mongodb/models/accountSchema";
 import bcrypt from "bcryptjs";
 import { POST as deviceHandler } from "@/app/api/users/devices/route";
diff --git a/tests/setup.ts b/tests/setup.ts
index 6e6dded..0e1cadc 100644
--- a/tests/setup.ts
+++ b/tests/setup.ts
@@ -11,6 +11,9 @@ beforeAll(async () => {
   // Set test DB URL
   process.env.MONGO_DB_URL = mongo.getUri();
 
+  // Set TOKEN_SECRET for JWT signing in tests
+  process.env.TOKEN_SECRET = "test-secret-key-for-jwt-signing";
+
   // Connect mongoose directly
   await mongoose.connect(process.env.MONGO_DB_URL);
   console.log("✅ Connected to in-memory MongoDB");