Test fixes

Author: ar2rsawseen

test/unit-tests/api.utils.log.js

@@ -9,21 +9,23 @@ describe('Log utility tests', function() {
     });
 
     afterEach(function() {
-        // Clean up test environment variables
+        // Clear all environment variables and restore original
         Object.keys(process.env).forEach(function(key) {
-            if (key.startsWith('COUNTLY_SETTINGS__LOGS__')) {
-                delete process.env[key];
-            }
+            delete process.env[key];
         });
+        Object.assign(process.env, originalEnv);
 
         // Clear require cache for log module and config to get fresh instances
         delete require.cache[require.resolve('../../api/utils/log.js')];
         delete require.cache[require.resolve('../../api/config.js')];
     });
 
     after(function() {
-        // Restore original environment
-        process.env = originalEnv;
+        // Final cleanup - restore original environment
+        Object.keys(process.env).forEach(function(key) {
+            delete process.env[key];
+        });
+        Object.assign(process.env, originalEnv);
     });
 
     describe('Default log levels', function() {

test/unit-tests/plugins.pluginManager.js

@@ -10,23 +10,24 @@ describe('PluginManager setConfigs with environment variables', function() {
     });
 
     beforeEach(function() {
-        // Clear any test environment variables
+        // Clear all test environment variables to prevent pollution between tests
         for (var key in process.env) {
-            if (key.startsWith('COUNTLY_SETTINGS__TEST')) {
+            if (key.startsWith('COUNTLY_SETTINGS__')) {
                 delete process.env[key];
             }
         }
 
+        // Clear require cache to get fresh pluginManager instance with no state
+        delete require.cache[require.resolve('../../plugins/pluginManager.js')];
+
         // Get pluginManager singleton instance
         pluginManager = require('../../plugins/pluginManager.js');
     });
 
     after(function() {
         // Restore original environment
         Object.keys(process.env).forEach(function(key) {
-            if (key.startsWith('COUNTLY_SETTINGS__')) {
-                delete process.env[key];
-            }
+            delete process.env[key];
         });
         Object.assign(process.env, originalEnv);
     });