diff --git a/tests/Search.test.js b/tests/Search.test.js
index cb49e735..ffdb8772 100644
--- a/tests/Search.test.js
+++ b/tests/Search.test.js
@@ -59,7 +59,7 @@ describe('Tests for Search', function() {
             tempBatchPath = path.join(userConfigDir, 'data', 'temp_batch_indexes');
             dataFolderPath = path.join(userConfigDir, 'data');
             if (fs.existsSync(dataFolderPath)) {
-                fs.unlinkSync(dataFolderPath)
+                deleteIndexFolders(dataFolderPath)
             }
             done();
         });
diff --git a/tests/SearchUtils.test.js b/tests/SearchUtils.test.js
index 28278d6f..c429876d 100644
--- a/tests/SearchUtils.test.js
+++ b/tests/SearchUtils.test.js
@@ -33,6 +33,9 @@ describe('Tests for Search Utils', function() {
 
     beforeAll(function (done) {
         executionPath = path.join(__dirname, 'library');
+        if (!isMac) {
+            executionPath = path.join(__dirname, '..', 'library');
+        }
         userConfigDir = path.join(__dirname, '..');
         searchConfig = require('../js/search/searchConfig.js');
         const { SearchUtils } = require('../js/search/searchUtils.js');