diff --git a/README.md b/README.md
index bf622d91..a019955f 100644
--- a/README.md
+++ b/README.md
@@ -121,3 +121,10 @@ This project uses Grunt to automate various development tasks. Here are some of
 
 * **`grunt shell:pushEng`**: Extracts English strings for translation, pushes them to Transifex, and updates the English PO file.
 * **`grunt shell:updateLang`**: Pulls translations from Transifex and updates the language files.
+
+#### Unit Tests
+
+This project uses `Karma` as the test runner utilizing a headless Chrome browser (be sure that Chrome is installed on
+your workstation).
+
+* **`npm test`**: Executes entire test suite located under `/test`/
diff --git a/test/karma.conf.js b/test/karma.conf.js
index d953ad67..7c18d8c4 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 const path = require('path');
 
 module.exports = function (config) {
@@ -5,6 +7,8 @@ module.exports = function (config) {
 		frameworks: ['mocha', 'chai'],
 		basePath: '../',
 		files: [
+			// The file order below is important to prevent undefined errors during testing!
+			// Load dependencies
 			{ pattern: 'www/css/jqm.css', included: true, watched: false },
 			{ pattern: 'www/css/main.css', included: true, watched: false },
 			{ pattern: 'node_modules/mocha/mocha.css', included: true, watched: false },
@@ -14,14 +18,16 @@ module.exports = function (config) {
 			{ pattern: 'www/vendor-js/jqm.js', included: true, watched: false },
 			{ pattern: 'www/vendor-js/dataTables-2.1.8.min.js', included: true, watched: false },
 			{ pattern: 'www/index.html', included: false, watched: false, served: true },
-			'test/prepare_tests.js',
 			{ pattern: 'www/css/images/ajax-loader.gif', included: false, watched: false, served: true },
-			{ pattern: 'www/js/modules/*.js', included: true, watched: false },
+			{ pattern: 'www/js/modules/**/*.js', included: true, watched: false },
 			{ pattern: 'www/js/main.js', included: true, watched: false },
 			'node_modules/sinon/pkg/sinon.js',
-			'test/tests.js'
+			// Prepare the test environment server
+			'test/prepare_tests.js',
+			// Load all tests
+			'test/tests/**/*.js',
 		],
 		browsers: ['ChromeHeadless'],
-		singleRun: true
+		singleRun: true,
 	});
 };
diff --git a/test/prepare_tests.js b/test/prepare_tests.js
index c28f055e..dba1f3f9 100644
--- a/test/prepare_tests.js
+++ b/test/prepare_tests.js
@@ -1,4 +1,6 @@
 /* eslint-disable */
+var assert = chai.assert;
+var server;
 
 before(function () {
 	return new Promise(function (resolve) {
@@ -13,3 +15,59 @@ before(function () {
 		});
 	});
 });
+
+before(function() {
+	server = sinon.fakeServer.create();
+	server.autoRespond = true;
+
+	// Mock responses using a function to handle requests
+	server.respondWith(function(request) {
+		var url = request.url;
+		var baseUrl = 'https://demo.opensprinkler.com';
+		var urlObj = new URL(url, baseUrl);
+		var pathname = urlObj.pathname;
+		var params = new URLSearchParams(urlObj.search);
+
+		if (pathname === '/jp') {
+			request.respond(200, { "Content-Type": "application/json" },
+				'{"nprogs":0,"nboards":1,"mnp":40,"mnst":4,"pnsize":32,"pd":[]}'
+			);
+		} else if (pathname === '/jn') {
+			request.respond(200, { "Content-Type": "application/json" },
+				'{"masop":[255],"masop2":[0],"ignore_rain":[0],"ignore_sn1":[0],"ignore_sn2":[0],"stn_dis":[0],"stn_spe":[0],"stn_grp":[0,0,0,0,0,0,0,0],"snames":["S01","S02","S03","S04","S05","S06","S07","S08"],"maxlen":32}'
+			);
+		} else if (pathname === '/jo') {
+			request.respond(200, { "Content-Type": "application/json" },
+				'{"fwv":221,"tz":28,"hp0":144,"hp1":31,"hwv":255,"ext":0,"sdt":0,"mas":0,"mton":0,"mtof":0,"wl":100,"den":1,"ipas":0,"devid":0,"uwt":0,"ntp1":0,"ntp2":0,"ntp3":0,"ntp4":0,"lg":1,"mas2":0,"mton2":0,"mtof2":0,"fwm":0,"fpr0":100,"fpr1":0,"re":0,"sar":0,"ife":0,"sn1t":0,"sn1o":1,"sn2t":0,"sn2o":1,"sn1on":0,"sn1of":0,"sn2on":0,"sn2of":0,"resv1":0,"resv2":0,"resv3":0,"resv4":0,"resv5":0,"resv6":0,"resv7":0,"resv8":0,"wimod":169,"reset":0,"dexp":-1,"mexp":24,"hwt":255,"ms":[0,0,0,0,0,0]}'
+			);
+		} else if (pathname === '/js') {
+			request.respond(200, { "Content-Type": "application/json" },
+				'{"sn":[0,0,0,0,0,0,0,0],"nstations":8}'
+			);
+		} else if (pathname === '/jc') {
+			request.respond(200, { "Content-Type": "application/json" },
+				'{"devt":1732789106,"nbrd":1,"en":1,"sn1":0,"sn2":0,"rd":0,"rdst":0,"sunrise":412,"sunset":975,"eip":2728304343,"lwc":1732784441,"lswc":1732784441,"lupt":0,"lrbtc":1,"lrun":[0,0,0,0],"pq":0,"pt":0,"nq":0,"otc":{},"otcs":0,"mac":"02:42:AC:12:00:02","loc":"42.36,-71.06","jsp":"https://ui.opensprinkler.com/js","wsp":"weather.opensprinkler.com","wto":{},"ifkey":"","mqtt":{},"wtdata":{"wp":"Manual"},"wterr":0,"dname":"My OpenSprinkler","email":{},"sbits":[0,0],"ps":[[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]],"gpio":[]}'
+			);
+		} else if (pathname === '/jl') {
+			// Handle dynamic URLs with start and end query parameters
+			var type = params.get('type');
+			var response;
+			if (type === 'wl') {
+				response = `[[0,"wl",100,1732158027],[0,"wl",100,1732179641],[0,"wl",100,1732201255],[0,"wl",100,1732222812],[0,"wl",100,1732244426],[0,"wl",100,1732266040],[0,"wl",100,1732287654],[0,"wl",100,1732309212],[0,"wl",100,1732330826],[0,"wl",100,1732352440],[0,"wl",100,1732374054],[0,"wl",100,1732395613],[0,"wl",100,1732417227],[0,"wl",100,1732438841],[0,"wl",100,1732460455],[0,"wl",100,1732482013],[0,"wl",100,1732503627],[0,"wl",100,1732525241],[0,"wl",100,1732546855],[0,"wl",100,1732568414],[0,"wl",100,1732590028],[0,"wl",100,1732611642],[0,"wl",100,1732633256],[0,"wl",100,1732639575],[0,"wl",100,1732654813],[0,"wl",100,1732676427],[0,"wl",100,1732698041],[0,"wl",100,1732719655],[0,"wl",100,1732741213],[0,"wl",100,1732762827],[0,"wl",100,1732784441]]`;
+			} else if (type === 'fl') {
+				response = '[]';
+			} else {
+				response = `[[99,0,64,1732207586],[99,0,64,1732505562],[1,0,60,1732514461],[1,1,60,1732514521]]`;
+			}
+			request.respond(200, { "Content-Type": "application/json" }, response);
+		} else {
+			request.respond(404, { "Content-Type": "application/json" }, '{"error": "Not Found"}');
+		}
+	});
+});
+
+after(function() {
+	if (server) {
+		server.restore();
+	}
+});
diff --git a/test/tests.js b/test/tests.js
deleted file mode 100644
index 40bc3df0..00000000
--- a/test/tests.js
+++ /dev/null
@@ -1,444 +0,0 @@
-/* eslint-disable */
-
-/* OpenSprinkler App
- * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
- *
- * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-var assert = chai.assert;
-var server;
-
-before(function() {
-    server = sinon.fakeServer.create();
-    server.autoRespond = true;
-
-    // Mock responses using a function to handle requests
-    server.respondWith(function(request) {
-        var url = request.url;
-        var baseUrl = 'https://demo.opensprinkler.com';
-        var urlObj = new URL(url, baseUrl);
-        var pathname = urlObj.pathname;
-        var params = new URLSearchParams(urlObj.search);
-
-        if (pathname === '/jp') {
-            request.respond(200, { "Content-Type": "application/json" },
-                '{"nprogs":0,"nboards":1,"mnp":40,"mnst":4,"pnsize":32,"pd":[]}'
-            );
-        } else if (pathname === '/jn') {
-            request.respond(200, { "Content-Type": "application/json" },
-                '{"masop":[255],"masop2":[0],"ignore_rain":[0],"ignore_sn1":[0],"ignore_sn2":[0],"stn_dis":[0],"stn_spe":[0],"stn_grp":[0,0,0,0,0,0,0,0],"snames":["S01","S02","S03","S04","S05","S06","S07","S08"],"maxlen":32}'
-            );
-        } else if (pathname === '/jo') {
-            request.respond(200, { "Content-Type": "application/json" },
-                '{"fwv":221,"tz":28,"hp0":144,"hp1":31,"hwv":255,"ext":0,"sdt":0,"mas":0,"mton":0,"mtof":0,"wl":100,"den":1,"ipas":0,"devid":0,"uwt":0,"ntp1":0,"ntp2":0,"ntp3":0,"ntp4":0,"lg":1,"mas2":0,"mton2":0,"mtof2":0,"fwm":0,"fpr0":100,"fpr1":0,"re":0,"sar":0,"ife":0,"sn1t":0,"sn1o":1,"sn2t":0,"sn2o":1,"sn1on":0,"sn1of":0,"sn2on":0,"sn2of":0,"resv1":0,"resv2":0,"resv3":0,"resv4":0,"resv5":0,"resv6":0,"resv7":0,"resv8":0,"wimod":169,"reset":0,"dexp":-1,"mexp":24,"hwt":255,"ms":[0,0,0,0,0,0]}'
-            );
-        } else if (pathname === '/js') {
-            request.respond(200, { "Content-Type": "application/json" },
-                '{"sn":[0,0,0,0,0,0,0,0],"nstations":8}'
-            );
-        } else if (pathname === '/jc') {
-            request.respond(200, { "Content-Type": "application/json" },
-                '{"devt":1732789106,"nbrd":1,"en":1,"sn1":0,"sn2":0,"rd":0,"rdst":0,"sunrise":412,"sunset":975,"eip":2728304343,"lwc":1732784441,"lswc":1732784441,"lupt":0,"lrbtc":1,"lrun":[0,0,0,0],"pq":0,"pt":0,"nq":0,"otc":{},"otcs":0,"mac":"02:42:AC:12:00:02","loc":"42.36,-71.06","jsp":"https://ui.opensprinkler.com/js","wsp":"weather.opensprinkler.com","wto":{},"ifkey":"","mqtt":{},"wtdata":{"wp":"Manual"},"wterr":0,"dname":"My OpenSprinkler","email":{},"sbits":[0,0],"ps":[[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]],"gpio":[]}'
-            );
-        } else if (pathname === '/jl') {
-            // Handle dynamic URLs with start and end query parameters
-            var type = params.get('type');
-            var response;
-            if (type === 'wl') {
-                response = `[[0,"wl",100,1732158027],[0,"wl",100,1732179641],[0,"wl",100,1732201255],[0,"wl",100,1732222812],[0,"wl",100,1732244426],[0,"wl",100,1732266040],[0,"wl",100,1732287654],[0,"wl",100,1732309212],[0,"wl",100,1732330826],[0,"wl",100,1732352440],[0,"wl",100,1732374054],[0,"wl",100,1732395613],[0,"wl",100,1732417227],[0,"wl",100,1732438841],[0,"wl",100,1732460455],[0,"wl",100,1732482013],[0,"wl",100,1732503627],[0,"wl",100,1732525241],[0,"wl",100,1732546855],[0,"wl",100,1732568414],[0,"wl",100,1732590028],[0,"wl",100,1732611642],[0,"wl",100,1732633256],[0,"wl",100,1732639575],[0,"wl",100,1732654813],[0,"wl",100,1732676427],[0,"wl",100,1732698041],[0,"wl",100,1732719655],[0,"wl",100,1732741213],[0,"wl",100,1732762827],[0,"wl",100,1732784441]]`;
-            } else if (type === 'fl') {
-                response = '[]';
-            } else {
-                response = `[[99,0,64,1732207586],[99,0,64,1732505562],[1,0,60,1732514461],[1,1,60,1732514521]]`;
-            }
-            request.respond(200, { "Content-Type": "application/json" }, response);
-        } else {
-            request.respond(404, { "Content-Type": "application/json" }, '{"error": "Not Found"}');
-        }
-    });
-});
-
-after(function() {
-    if (server) {
-        server.restore();
-    }
-});
-
-describe("Initial Definition Check", function () {
-	it("storage.set(object,callback) should accept an object of key/value pairs to be set into localStorage and respond with callback", function (done) {
-		assert.doesNotThrow(function () {
-			OSApp.Storage.set({
-				"testkey": "helloworld",
-				"sites": JSON.stringify({
-					"Test": {
-						"os_ip": "127.0.0.1:8080",
-						"os_pw": "opendoor"
-					}
-				}),
-				"current_site": "Test"
-			}, function (result) {
-				result === true ? done() : done(new Error("Failed to set key/value pairs", result.Error));
-			});
-		});
-	});
-
-	it("storage.get(object,callback) should accept an array of keys to be retrieved from localStorage and respond with callback", function (done) {
-		assert.doesNotThrow(function () {
-			OSApp.Storage.get(["testkey"], function (result) {
-				if (result.testkey === "helloworld") {
-					done();
-				}
-			});
-		});
-	});
-
-	it("storage.remove(object,callback) should accept an array of keys to be deleted from localStorage and respond with callback", function (done) {
-		assert.doesNotThrow(function () {
-			OSApp.Storage.remove(["testkey"], function (result) {
-				if (result === true) {
-					done();
-				}
-			});
-		});
-	});
-
-	it("storage.remove(string,callback) should accept a key to be deleted from localStorage and respond with callback", function (done) {
-		assert.doesNotThrow(function () {
-			OSApp.Storage.remove("fakekey", function (result) {
-				if (result === true) {
-					done();
-				}
-			});
-		});
-	});
-});
-
-describe("OpenSprinkler Firmware Version Functions", function () {
-
-	describe("Test against Arduino Firmware Version", function () {
-		before(function () {
-			OSApp.currentSession.controller.options = {
-				fwv: 210
-			};
-		});
-		it("isOPSi() should identify if the device is an OSPi", function () {
-			assert.equal(false, OSApp.Firmware.isOSPi());
-		});
-		it("versionCompare(device,compare) should check the given firmware (device) against the compare firmware where the input is an array", function () {
-			assert.strictEqual(false, OSApp.Firmware.versionCompare([1], [1, 5]));
-			assert.strictEqual(0, OSApp.Firmware.versionCompare([1, 5], [1, 5]));
-			assert.strictEqual(1, OSApp.Firmware.versionCompare([2, 1], [1, 5]));
-		});
-		it("checkOSVersion(compare) should compare the input firmware version against the Arduino firmware version.", function () {
-			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(211));
-			assert.strictEqual(true, OSApp.Firmware.checkOSVersion(210));
-			assert.strictEqual(1, OSApp.Firmware.checkOSVersion(208));
-		});
-		it("checkOSPiVersion(compare) should compare the input firmware version against the OSPi firmware version.", function () {
-			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.0"));
-			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("1.9"));
-			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.1"));
-		});
-	});
-
-	describe("Test against OSPi Firmware Version", function () {
-		before(function () {
-			OSApp.currentSession.controller.options = {
-				fwv: "1.9.0-OSPi"
-			};
-		});
-		it("isOPSi() should identify if the device is an OSPi", function () {
-			assert.equal(true, OSApp.Firmware.isOSPi());
-		});
-		it("versionCompare(device,compare) should check the given firmware (device) against the compare firmware where the input is an array", function () {
-			assert.strictEqual(false, OSApp.Firmware.versionCompare([1], [1, 5]));
-			assert.strictEqual(0, OSApp.Firmware.versionCompare([1, 5], [1, 5]));
-			assert.strictEqual(1, OSApp.Firmware.versionCompare([2, 1], [1, 5]));
-		});
-		it("checkOSVersion(compare) should compare the input firmware version against the Arduino firmware version.", function () {
-			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(211));
-			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(210));
-			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(208));
-		});
-		it("checkOSPiVersion(compare) should compare the input firmware version against the OSPi firmware version.", function () {
-			assert.strictEqual(1, OSApp.Firmware.checkOSPiVersion("1.8"));
-			assert.strictEqual(true, OSApp.Firmware.checkOSPiVersion("1.9.0"));
-			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.0"));
-			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.1"));
-		});
-	});
-
-	describe("Retrieve the formatted firmware version", function () {
-		before(function () {
-			OSApp.currentSession.controller.options = {
-				fwv: 204
-			};
-		});
-		it("getOSVersion(fwv) should return the firmware in a string representation", function () {
-			assert.equal("1.8.3-OSPi", OSApp.Firmware.getOSVersion("1.8.3-OSPi"));
-			assert.equal("2.1.193-OSPi", OSApp.Firmware.getOSVersion("2.1.193-OSPi"));
-			assert.equal("2.0.8", OSApp.Firmware.getOSVersion(208));
-			assert.equal("2.0.4", OSApp.Firmware.getOSVersion());
-		});
-	});
-});
-
-describe("General Function Checks", function () {
-	it("OSApp.Utils.parseIntArray(array) should convert all members into integers", function () {
-		assert.deepEqual([9, 394, 29193, -1], OSApp.Utils.parseIntArray(["9", "394", "29193", "-1"]));
-	});
-
-	it("OSApp.Dates.sec2hms(number) should return a string representation of the difference the input represents (seconds)", function () {
-		assert.equal("23:59:59", OSApp.Dates.sec2hms(86399));
-		assert.equal("15:00", OSApp.Dates.sec2hms(900));
-	});
-
-	it("OSApp.Dates.sec2dhms(number) should return an object containing days, hours, minutes and seconds from the input (seconds)", function () {
-		assert.deepEqual({
-			days: 936,
-			hours: 17,
-			minutes: 20,
-			seconds: 9
-		}, OSApp.Dates.sec2dhms(80932809));
-	});
-
-	it("OSApp.Dates.dhms2str(object) should convert an object with elements days, hours, minutes and seconds into a string representation", function () {
-		assert.equal("5d 4h 3m 1s", OSApp.Dates.dhms2str({ days: 5, hours: 4, minutes: 3, seconds: 1 }));
-		assert.equal("0s", OSApp.Dates.dhms2str({}));
-	});
-
-	it("OSApp.Dates.dhms2sec(object) should convert an object with elements days, hours, minutes and seconds into a second value", function () {
-		assert.equal(100981, OSApp.Dates.dhms2sec({ days: 1, hours: 4, minutes: 3, seconds: 1 }));
-	});
-
-	it("OSApp.Dates.getDayName(day,type) should return the day of the week and can be of type 'short'", function () {
-		assert.equal("Monday", OSApp.Dates.getDayName(new Date(Date.UTC(2014, 8, 15, 12, 45, 28))));
-		assert.equal("Thu", OSApp.Dates.getDayName(new Date(Date.UTC(2014, 8, 11, 12, 45, 28)), "short"));
-	});
-
-	it("OSApp.Utils.pad(number) should successfully prepend a 0 to a single digit", function () {
-		assert.equal("00", OSApp.Utils.pad(0));
-		assert.equal("01", OSApp.Utils.pad(1));
-		assert.equal("10", OSApp.Utils.pad(10));
-		assert.equal("999", OSApp.Utils.pad(999));
-	});
-
-	it("OSApp.Weather.getCurrentAdjustmentMethodId() should return the adjustment method ID", function () {
-		assert.equal(0, OSApp.Weather.getCurrentAdjustmentMethodId());
-	});
-
-	it("OSApp.Weather.getAdjustmentMethod(uwt) should return the adjustment method for the corresponding ID", function () {
-		assert.equal("Manual", OSApp.Weather.getAdjustmentMethod(0).name);
-		assert.equal("Manual", OSApp.Weather.getAdjustmentMethod(128).name);
-		assert.equal("Zimmerman", OSApp.Weather.getAdjustmentMethod(1).name);
-		assert.equal("Zimmerman", OSApp.Weather.getAdjustmentMethod(129).name);
-	});
-});
-
-describe("Page Navigation Checks", function () {
-	before(function () {
-		OSApp.currentSession.ip = "demo.opensprinkler.com";
-		OSApp.currentSession.pass = "opendoor";
-		OSApp.currentSession.prefix = "https://";
-		OSApp.currentSession.fw183 = false;
-
-		OSApp.Sites.updateSiteList(["Test"], "Test");
-	});
-
-	it("Start jQuery Mobile Page Initialization", function (done) {
-		$.mobile.document.one("pageshow", "#sprinklers", function () {
-			done();
-		});
-
-		OSApp.Sites.newLoad();
-	});
-
-	it( "Change page to program preview", function( done ) {
-		$.mobile.document.one( "pageshow", "#preview", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#preview" );
-		} );
-	} );
-
-	it( "Change to logs page", function( done ) {
-		$.mobile.document.one( "pageshow", "#logs", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#logs" );
-		} );
-	} );
-
-	it( "Change to runonce page", function( done ) {
-		$.mobile.document.one( "pageshow", "#runonce", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#runonce" );
-		} );
-	} );
-
-	it( "Change to edit programs page", function( done ) {
-		$.mobile.document.one( "pageshow", "#programs", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#programs" );
-		} );
-	} );
-
-	it( "Change to add new program page", function( done ) {
-		$.mobile.document.one( "pageshow", "#addprogram", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#addprogram" );
-		} );
-	} );
-
-	it( "Change to options page", function( done ) {
-		$.mobile.document.one( "pageshow", "#os-options", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#os-options" );
-		} );
-	} );
-
-	it( "Change to site manager page", function( done ) {
-		$.mobile.document.one( "pageshow", "#site-control", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#site-control" );
-		} );
-	} );
-
-	it( "Change to about page", function( done ) {
-		$.mobile.document.one( "pageshow", "#about", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.changePage( "#about" );
-		} );
-	} );
-});
-
-describe("Popup Checks", function () {
-
-	it( "Show main menu popup", function( done ) {
-		$.mobile.document.one( "popupafteropen", "#mainMenu", function() {
-			done();
-		} );
-		assert.doesNotThrow( function() {
-			OSApp.UIDom.showHomeMenu();
-		} );
-	} );
-
-	it( "Show change rain delay popup", function( done ) {
-		$.mobile.document.one( "popupafteropen", "#durationBox", function() {
-			$.mobile.document.one( "popupafterclose", "#durationBox", function() {
-				done();
-			} );
-			$( "#durationBox" ).popup( "close" ).remove();
-		} );
-		assert.doesNotThrow( function() {
-			$( "#mainMenu" ).find( "a[href='#raindelay']" ).trigger( "click" );
-		} );
-	} );
-
-	it("Show add new site popup", function (done) {
-		$.mobile.document.one("popupafteropen", "#addnew", function () {
-			$.mobile.document.one("popupafterclose", "#addnew", function () {
-				done();
-			});
-			$("#addnew").popup("close").remove();
-		});
-		assert.doesNotThrow(function () {
-			OSApp.Sites.showAddNew();
-		});
-	});
-
-	it("Show site select popup", function (done) {
-		$.mobile.document.one("popupafteropen", "#site-select", function () {
-			$.mobile.document.one("popupafterclose", "#site-select", function () {
-				done();
-			});
-			$("#site-select").popup("close").remove();
-		});
-		assert.doesNotThrow(function () {
-			OSApp.Sites.showSiteSelect();
-		});
-	});
-
-	it("Show are you sure popup", function (done) {
-		$.mobile.document.one("popupafteropen", "#sure", function () {
-			$("#sure .sure-do").trigger("click");
-		});
-		assert.doesNotThrow(function () {
-			OSApp.UIDom.areYouSure(null, null, done);
-		});
-	});
-
-	it("Show IP Address input popup", function (done) {
-		$.mobile.document.one("popupafteropen", "#ipInput", function () {
-			$.mobile.document.one("popupafterclose", "#ipInput", function () {
-				done();
-			});
-			$("#ipInput").popup("close").remove();
-		});
-		assert.doesNotThrow(function () {
-			OSApp.UIDom.showIPRequest();
-		});
-	});
-
-	it("Show single duration input popup", function (done) {
-		$.mobile.document.one("popupafteropen", "#singleDuration", function () {
-			$.mobile.document.one("popupafterclose", "#singleDuration", function () {
-				done();
-			});
-			$("#singleDuration").popup("close").remove();
-		});
-		assert.doesNotThrow(function () {
-			OSApp.UIDom.showSingleDurationInput();
-		});
-	});
-
-	it("Show language selection popup", function (done) {
-		$.mobile.document.one("popupafteropen", "#localization", function () {
-			$.mobile.document.one("popupafterclose", "#localization", function () {
-				done();
-			});
-			$("#localization").popup("close").remove();
-		});
-		assert.doesNotThrow(function () {
-			OSApp.Language.languageSelect();
-		});
-	});
-});
-
-describe("Logout / Clean up", function () {
-	it("Remove all variables", function (done) {
-		OSApp.Storage.remove(["sites", "current_site", "lang", "runonce"], function () {
-			done();
-		});
-	});
-
-	it("Go to start page", function (done) {
-		$.mobile.document.one("pageshow", "#start", function () {
-			done();
-		});
-		OSApp.currentSession.ip = "";
-		OSApp.UIDom.changePage("#start");
-	});
-});
diff --git a/test/tests/general_function_checks.js b/test/tests/general_function_checks.js
new file mode 100644
index 00000000..1079db35
--- /dev/null
+++ b/test/tests/general_function_checks.js
@@ -0,0 +1,67 @@
+/* eslint-disable */
+
+/* OpenSprinkler App
+ * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
+ *
+ * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+describe("General Function Checks", function () {
+	it("OSApp.Utils.parseIntArray(array) should convert all members into integers", function () {
+		assert.deepEqual([9, 394, 29193, -1], OSApp.Utils.parseIntArray(["9", "394", "29193", "-1"]));
+	});
+
+	it("OSApp.Dates.sec2hms(number) should return a string representation of the difference the input represents (seconds)", function () {
+		assert.equal("23:59:59", OSApp.Dates.sec2hms(86399));
+		assert.equal("15:00", OSApp.Dates.sec2hms(900));
+	});
+
+	it("OSApp.Dates.sec2dhms(number) should return an object containing days, hours, minutes and seconds from the input (seconds)", function () {
+		assert.deepEqual({
+			days: 936,
+			hours: 17,
+			minutes: 20,
+			seconds: 9
+		}, OSApp.Dates.sec2dhms(80932809));
+	});
+
+	it("OSApp.Dates.dhms2str(object) should convert an object with elements days, hours, minutes and seconds into a string representation", function () {
+		assert.equal("5d 4h 3m 1s", OSApp.Dates.dhms2str({ days: 5, hours: 4, minutes: 3, seconds: 1 }));
+		assert.equal("0s", OSApp.Dates.dhms2str({}));
+	});
+
+	it("OSApp.Dates.dhms2sec(object) should convert an object with elements days, hours, minutes and seconds into a second value", function () {
+		assert.equal(100981, OSApp.Dates.dhms2sec({ days: 1, hours: 4, minutes: 3, seconds: 1 }));
+	});
+
+	it("OSApp.Dates.getDayName(day,type) should return the day of the week and can be of type 'short'", function () {
+		assert.equal("Monday", OSApp.Dates.getDayName(new Date(Date.UTC(2014, 8, 15, 12, 45, 28))));
+		assert.equal("Thu", OSApp.Dates.getDayName(new Date(Date.UTC(2014, 8, 11, 12, 45, 28)), "short"));
+	});
+
+	it("OSApp.Utils.pad(number) should successfully prepend a 0 to a single digit", function () {
+		assert.equal("00", OSApp.Utils.pad(0));
+		assert.equal("01", OSApp.Utils.pad(1));
+		assert.equal("10", OSApp.Utils.pad(10));
+		assert.equal("999", OSApp.Utils.pad(999));
+	});
+
+	it("OSApp.Weather.getCurrentAdjustmentMethodId() should return the adjustment method ID", function () {
+		// FIXME: this test was failing after test refactoring due to uwt undefined. Resolved with elvis operator
+		assert.equal(0, OSApp.Weather.getCurrentAdjustmentMethodId());
+	});
+
+	it("OSApp.Weather.getAdjustmentMethod(uwt) should return the adjustment method for the corresponding ID", function () {
+		assert.equal("Manual", OSApp.Weather.getAdjustmentMethod(0).name);
+		assert.equal("Manual", OSApp.Weather.getAdjustmentMethod(128).name);
+		assert.equal("Zimmerman", OSApp.Weather.getAdjustmentMethod(1).name);
+		assert.equal("Zimmerman", OSApp.Weather.getAdjustmentMethod(129).name);
+	});
+});
diff --git a/test/tests/initial_definition_check.js b/test/tests/initial_definition_check.js
new file mode 100644
index 00000000..11ec6a99
--- /dev/null
+++ b/test/tests/initial_definition_check.js
@@ -0,0 +1,63 @@
+/* eslint-disable */
+
+/* OpenSprinkler App
+ * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
+ *
+ * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+describe("Initial Definition Check", function () {
+	it("storage.set(object,callback) should accept an object of key/value pairs to be set into localStorage and respond with callback", function (done) {
+		assert.doesNotThrow(function () {
+			OSApp.Storage.set({
+				"testkey": "helloworld",
+				"sites": JSON.stringify({
+					"Test": {
+						"os_ip": "127.0.0.1:8080",
+						"os_pw": "opendoor"
+					}
+				}),
+				"current_site": "Test"
+			}, function (result) {
+				result === true ? done() : done(new Error("Failed to set key/value pairs", result.Error));
+			});
+		});
+	});
+
+	it("storage.get(object,callback) should accept an array of keys to be retrieved from localStorage and respond with callback", function (done) {
+		assert.doesNotThrow(function () {
+			OSApp.Storage.get(["testkey"], function (result) {
+				if (result.testkey === "helloworld") {
+					done();
+				}
+			});
+		});
+	});
+
+	it("storage.remove(object,callback) should accept an array of keys to be deleted from localStorage and respond with callback", function (done) {
+		assert.doesNotThrow(function () {
+			OSApp.Storage.remove(["testkey"], function (result) {
+				if (result === true) {
+					done();
+				}
+			});
+		});
+	});
+
+	it("storage.remove(string,callback) should accept a key to be deleted from localStorage and respond with callback", function (done) {
+		assert.doesNotThrow(function () {
+			OSApp.Storage.remove("fakekey", function (result) {
+				if (result === true) {
+					done();
+				}
+			});
+		});
+	});
+});
diff --git a/test/tests/logout_cleanup.js b/test/tests/logout_cleanup.js
new file mode 100644
index 00000000..af54f774
--- /dev/null
+++ b/test/tests/logout_cleanup.js
@@ -0,0 +1,30 @@
+/* eslint-disable */
+
+/* OpenSprinkler App
+ * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
+ *
+ * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+describe("Logout / Clean up", function () {
+	it("Remove all variables", function (done) {
+		OSApp.Storage.remove(["sites", "current_site", "lang", "runonce"], function () {
+			done();
+		});
+	});
+
+	it("Go to start page", function (done) {
+		$.mobile.document.one("pageshow", "#start", function () {
+			done();
+		});
+		OSApp.currentSession.ip = "";
+		OSApp.UIDom.changePage("#start");
+	});
+});
diff --git a/test/tests/os_firmware_version_functions.js b/test/tests/os_firmware_version_functions.js
new file mode 100644
index 00000000..5d5b27b3
--- /dev/null
+++ b/test/tests/os_firmware_version_functions.js
@@ -0,0 +1,84 @@
+/* eslint-disable */
+
+/* OpenSprinkler App
+ * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
+ *
+ * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+describe("OpenSprinkler Firmware Version Functions", function () {
+
+	describe("Test against Arduino Firmware Version", function () {
+		before(function () {
+			OSApp.currentSession.controller.options = {
+				fwv: 210
+			};
+		});
+		it("isOPSi() should identify if the device is an OSPi", function () {
+			assert.equal(false, OSApp.Firmware.isOSPi());
+		});
+		it("versionCompare(device,compare) should check the given firmware (device) against the compare firmware where the input is an array", function () {
+			assert.strictEqual(false, OSApp.Firmware.versionCompare([1], [1, 5]));
+			assert.strictEqual(0, OSApp.Firmware.versionCompare([1, 5], [1, 5]));
+			assert.strictEqual(1, OSApp.Firmware.versionCompare([2, 1], [1, 5]));
+		});
+		it("checkOSVersion(compare) should compare the input firmware version against the Arduino firmware version.", function () {
+			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(211));
+			assert.strictEqual(true, OSApp.Firmware.checkOSVersion(210));
+			assert.strictEqual(1, OSApp.Firmware.checkOSVersion(208));
+		});
+		it("checkOSPiVersion(compare) should compare the input firmware version against the OSPi firmware version.", function () {
+			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.0"));
+			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("1.9"));
+			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.1"));
+		});
+	});
+
+	describe("Test against OSPi Firmware Version", function () {
+		before(function () {
+			OSApp.currentSession.controller.options = {
+				fwv: "1.9.0-OSPi"
+			};
+		});
+		it("isOPSi() should identify if the device is an OSPi", function () {
+			assert.equal(true, OSApp.Firmware.isOSPi());
+		});
+		it("versionCompare(device,compare) should check the given firmware (device) against the compare firmware where the input is an array", function () {
+			assert.strictEqual(false, OSApp.Firmware.versionCompare([1], [1, 5]));
+			assert.strictEqual(0, OSApp.Firmware.versionCompare([1, 5], [1, 5]));
+			assert.strictEqual(1, OSApp.Firmware.versionCompare([2, 1], [1, 5]));
+		});
+		it("checkOSVersion(compare) should compare the input firmware version against the Arduino firmware version.", function () {
+			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(211));
+			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(210));
+			assert.strictEqual(false, OSApp.Firmware.checkOSVersion(208));
+		});
+		it("checkOSPiVersion(compare) should compare the input firmware version against the OSPi firmware version.", function () {
+			assert.strictEqual(1, OSApp.Firmware.checkOSPiVersion("1.8"));
+			assert.strictEqual(true, OSApp.Firmware.checkOSPiVersion("1.9.0"));
+			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.0"));
+			assert.strictEqual(false, OSApp.Firmware.checkOSPiVersion("2.1"));
+		});
+	});
+
+	describe("Retrieve the formatted firmware version", function () {
+		before(function () {
+			OSApp.currentSession.controller.options = {
+				fwv: 204
+			};
+		});
+		it("getOSVersion(fwv) should return the firmware in a string representation", function () {
+			assert.equal("1.8.3-OSPi", OSApp.Firmware.getOSVersion("1.8.3-OSPi"));
+			assert.equal("2.1.193-OSPi", OSApp.Firmware.getOSVersion("2.1.193-OSPi"));
+			assert.equal("2.0.8", OSApp.Firmware.getOSVersion(208));
+			assert.equal("2.0.4", OSApp.Firmware.getOSVersion());
+		});
+	});
+});
diff --git a/test/tests/page_navigation_checks.js b/test/tests/page_navigation_checks.js
new file mode 100644
index 00000000..f8032b6f
--- /dev/null
+++ b/test/tests/page_navigation_checks.js
@@ -0,0 +1,105 @@
+/* eslint-disable */
+
+/* OpenSprinkler App
+ * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
+ *
+ * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+describe("Page Navigation Checks", function () {
+	before(function () {
+		OSApp.currentSession.ip = "demo.opensprinkler.com";
+		OSApp.currentSession.pass = "opendoor";
+		OSApp.currentSession.prefix = "https://";
+		OSApp.currentSession.fw183 = false;
+
+		OSApp.Sites.updateSiteList(["Test"], "Test");
+	});
+
+	it("Start jQuery Mobile Page Initialization", function (done) {
+		$.mobile.document.one("pageshow", "#sprinklers", function () {
+			done();
+		});
+
+		OSApp.Sites.newLoad();
+	});
+
+	it( "Change page to program preview", function( done ) {
+		$.mobile.document.one( "pageshow", "#preview", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#preview" );
+		} );
+	} );
+
+	it( "Change to logs page", function( done ) {
+		$.mobile.document.one( "pageshow", "#logs", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#logs" );
+		} );
+	} );
+
+	it( "Change to runonce page", function( done ) {
+		$.mobile.document.one( "pageshow", "#runonce", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#runonce" );
+		} );
+	} );
+
+	it( "Change to edit programs page", function( done ) {
+		$.mobile.document.one( "pageshow", "#programs", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#programs" );
+		} );
+	} );
+
+	it( "Change to add new program page", function( done ) {
+		$.mobile.document.one( "pageshow", "#addprogram", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#addprogram" );
+		} );
+	} );
+
+	it( "Change to options page", function( done ) {
+		$.mobile.document.one( "pageshow", "#os-options", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#os-options" );
+		} );
+	} );
+
+	it( "Change to site manager page", function( done ) {
+		$.mobile.document.one( "pageshow", "#site-control", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#site-control" );
+		} );
+	} );
+
+	it( "Change to about page", function( done ) {
+		$.mobile.document.one( "pageshow", "#about", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.changePage( "#about" );
+		} );
+	} );
+});
diff --git a/test/tests/popup_checks.js b/test/tests/popup_checks.js
new file mode 100644
index 00000000..f35335d0
--- /dev/null
+++ b/test/tests/popup_checks.js
@@ -0,0 +1,107 @@
+/* eslint-disable */
+
+/* OpenSprinkler App
+ * Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
+ *
+ * This file is part of the OpenSprinkler project <http://opensprinkler.com>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+describe("Popup Checks", function () {
+
+	it( "Show main menu popup", function( done ) {
+		$.mobile.document.one( "popupafteropen", "#mainMenu", function() {
+			done();
+		} );
+		assert.doesNotThrow( function() {
+			OSApp.UIDom.showHomeMenu();
+		} );
+	} );
+
+	it( "Show change rain delay popup", function( done ) {
+		$.mobile.document.one( "popupafteropen", "#durationBox", function() {
+			$.mobile.document.one( "popupafterclose", "#durationBox", function() {
+				done();
+			} );
+			$( "#durationBox" ).popup( "close" ).remove();
+		} );
+		assert.doesNotThrow( function() {
+			$( "#mainMenu" ).find( "a[href='#raindelay']" ).trigger( "click" );
+		} );
+	} );
+
+	it("Show add new site popup", function (done) {
+		$.mobile.document.one("popupafteropen", "#addnew", function () {
+			$.mobile.document.one("popupafterclose", "#addnew", function () {
+				done();
+			});
+			$("#addnew").popup("close").remove();
+		});
+		assert.doesNotThrow(function () {
+			OSApp.Sites.showAddNew();
+		});
+	});
+
+	it("Show site select popup", function (done) {
+		$.mobile.document.one("popupafteropen", "#site-select", function () {
+			$.mobile.document.one("popupafterclose", "#site-select", function () {
+				done();
+			});
+			$("#site-select").popup("close").remove();
+		});
+		assert.doesNotThrow(function () {
+			OSApp.Sites.showSiteSelect();
+		});
+	});
+
+	it("Show are you sure popup", function (done) {
+		$.mobile.document.one("popupafteropen", "#sure", function () {
+			$("#sure .sure-do").trigger("click");
+		});
+		assert.doesNotThrow(function () {
+			OSApp.UIDom.areYouSure(null, null, done);
+		});
+	});
+
+	it("Show IP Address input popup", function (done) {
+		$.mobile.document.one("popupafteropen", "#ipInput", function () {
+			$.mobile.document.one("popupafterclose", "#ipInput", function () {
+				done();
+			});
+			$("#ipInput").popup("close").remove();
+		});
+		assert.doesNotThrow(function () {
+			OSApp.UIDom.showIPRequest();
+		});
+	});
+
+	it("Show single duration input popup", function (done) {
+		$.mobile.document.one("popupafteropen", "#singleDuration", function () {
+			$.mobile.document.one("popupafterclose", "#singleDuration", function () {
+				done();
+			});
+			$("#singleDuration").popup("close").remove();
+		});
+		assert.doesNotThrow(function () {
+			OSApp.UIDom.showSingleDurationInput();
+		});
+	});
+
+	it("Show language selection popup", function (done) {
+		$.mobile.document.one("popupafteropen", "#localization", function () {
+			$.mobile.document.one("popupafterclose", "#localization", function () {
+				done();
+			});
+			$("#localization").popup("close").remove();
+		});
+		assert.doesNotThrow(function () {
+			OSApp.Language.languageSelect();
+		});
+	});
+});
diff --git a/www/js/modules/ui-dom.js b/www/js/modules/ui-dom.js
index c204a569..166623df 100644
--- a/www/js/modules/ui-dom.js
+++ b/www/js/modules/ui-dom.js
@@ -401,6 +401,7 @@ OSApp.UIDom.launchApp = function() {
 
 	// FIXME: This needs to be rewritten and refactored out so it works properly (mellodev)
 	var showHome = ( function() {
+		var cards, siteSelect, currentSite, i, sites;
 		var page = $( "<div data-role='page' id='sprinklers'>" +
 				"<div class='ui-panel-wrapper'>" +
 					"<div class='ui-content' role='main'>" +
@@ -1348,23 +1349,28 @@ OSApp.UIDom.launchApp = function() {
 				currentSite = siteSelect.val();
 				OSApp.Storage.get( "sites", function( data ) {
 					sites = OSApp.Sites.parseSites( data.sites );
-					if ( typeof sites[ currentSite ].images !== "object" || $.isEmptyObject( sites[ currentSite ].images ) ) {
+					// Prevent errors during test: page navigation checks
+					if ( !sites || $.isEmptyObject(sites) || !currentSite ) {
+						return;
+					}
+
+					if ( typeof sites[ currentSite ]?.images !== "object" || $.isEmptyObject( sites[ currentSite ].images ) ) {
 						sites[ currentSite ].images = {};
 						page.removeClass( "has-images" );
 					} else {
 						page.addClass( "has-images" );
 					}
-					if ( typeof sites[ currentSite ].notes !== "object" ) {
+					if ( typeof sites[ currentSite ]?.notes !== "object" ) {
 						sites[ currentSite ].notes = {};
 					}
-					if ( typeof sites[ currentSite ].lastRunTime !== "object" ) {
+					if ( typeof sites[ currentSite ]?.lastRunTime !== "object" ) {
 						sites[ currentSite ].lastRunTime = {};
 					}
 
 					callback();
 				} );
-			},
-			cards, siteSelect, currentSite, i, sites;
+			};
+
 
 		page.one( "pageshow", function() {
 			$( "html" ).on( "datarefresh", updateContent );
diff --git a/www/js/modules/weather.js b/www/js/modules/weather.js
index d31517d3..0fde6cab 100644
--- a/www/js/modules/weather.js
+++ b/www/js/modules/weather.js
@@ -941,7 +941,7 @@ OSApp.Weather.getAdjustmentMethod = function( id ) {
 
 // TODO: does getAdjustmentMethod duplicate this logic? if so please refactor one or the other.
 OSApp.Weather.getCurrentAdjustmentMethodId = function() {
-	return OSApp.currentSession.controller.options.uwt & ~( 1 << 7 );
+	return OSApp.currentSession?.controller?.options?.uwt & ~( 1 << 7 );
 };
 
 OSApp.Weather.getRestriction = function( id ) {