diff --git a/unitTests/mainUnitTest.m b/unitTests/mainUnitTest.m
index c3d2ea497918bd670c26627465d91ce7d8fc7c8a..d546408cf5501325bc7fca283a564526c35a77dc 100644
--- a/unitTests/mainUnitTest.m
+++ b/unitTests/mainUnitTest.m
@@ -1,4 +1,4 @@
-function [apoResults, optResults,sensResults,simResults] = mainUnitTest(options)
+function [apoResults, optResults, sensResults, simResults] = mainUnitTest(options)
 arguments
     options.testApogeeAnalysis logical = [];
     options.testOptimization logical = [];
diff --git a/unitTests/saveTests.m b/unitTests/saveTests.m
index 7d2e3bece7b558422f3a2475db20de8f34b49670..1da82a0c43303a6a26b06b924a10481c584c7736 100644
--- a/unitTests/saveTests.m
+++ b/unitTests/saveTests.m
@@ -3,7 +3,7 @@ arguments
     rocket      = []    % Rocket      = Rocket.empty
     wind        = []    % Wind  = Wind.empty
     environment = []    % Environment = Environment.empty
-    settings     = []    % Settings    = Settings.empty
+    settings    = []    % Settings    = Settings.empty
     options.saveTestApogeeAnalysis logical = [];
     options.saveTestOptimization logical = [];
     options.saveTestSensitivity logical = [];
@@ -19,22 +19,22 @@ mission = Mission(true);
 if isempty(rocket), rocket  = Rocket(mission); end
 if isempty(environment), environment  = Environment(mission, rocket.motor); end
 if isempty(wind), wind  = Wind(mission); end
-if isempty(settings)
-    simPath = fullfile(fileparts(mfilename('fullpath')),'..', 'simulator', 'simulatorConfig.m');
-    %odePath = fullfile(fileparts(mfilename('fullpath')), '..', '..', 'common', 'settings ', 'odeConfig.m');
-    settings  = Settings(simPath, 'ode','unitTest');
-end
+if isempty(settings), settings  = Settings('unitTest'); end
 Settings.read(settings, options, 'unitTest');
 
 %% CREATING SIMULATOR TESTS
 if ~isempty(settings.unitTest.saveTestSimulator)
+    simPath = fullfile(fileparts(mfilename('fullpath')),'..', 'simulator', 'simulatorConfig.m');
+    simSettings  = Settings('ode', simPath);
     for k = 1:length(settings.unitTest.saveTestSimulator)
-        TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, mission, rocket, wind, environment, settings );
+        TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, rocket, wind, environment, simSettings );
     end
 end
 
 %% TEST APOGEE ANALYSIS
 if settings.unitTest.saveTestApogeeAnalysis
+    apoPath = fullfile(fileparts(mfilename('fullpath')),'..', 'apogeeAnalysis', 'apogeeAnalysisConfig.m');
+    apoSettings  = Settings('ode', apoPath);
     TestApogeeAnalysis.saveTest(mission);
 end
 
diff --git a/unitTests/tests/TestSimulator.m b/unitTests/tests/TestSimulator.m
index 34603fbc11592efce005c2f84c9e751471cd02a4..0072ee266e6bdf7f61cb90e9a94c488f340492d3 100644
--- a/unitTests/tests/TestSimulator.m
+++ b/unitTests/tests/TestSimulator.m
@@ -3,17 +3,18 @@ classdef TestSimulator < matlab.unittest.TestCase
     properties
         settings
         refSimulator
+        rocket
+        wind
+        environment
     end
 
     properties (MethodSetupParameter)
         verifiable = {'multipleAB', 'ballistic', 'engineCut', 'solid', 'HRE'};
     end
-
     
     methods (TestMethodSetup)
         function setup(testCase, verifiable)
             currentPath = fileparts(mfilename('fullpath'));
-            addpath(genpath(currentPath));
 
             fileName = sprintf("referenceState_%s.mat", verifiable);
             filePath = fullfile(currentPath, '..', 'data', 'testSimulator', verifiable, fileName);
@@ -35,7 +36,8 @@ classdef TestSimulator < matlab.unittest.TestCase
 
     methods (TestMethodTeardown)
         function teardown(testCase)
-            close all
+            mainSimPath = fullfile('..', '..', 'simulator');
+            rmpath(genpath(mainSimPath));
         end
     end
 
@@ -53,10 +55,9 @@ classdef TestSimulator < matlab.unittest.TestCase
     end
 
     methods (Static)
-        function saveTest(verifiable,mission,rocket, wind, environment, settings)
+        function saveTest(verifiable, rocket, wind, environment, settings)
             Time = tic;
             currentPath = fileparts(mfilename('fullpath'));
-            addpath(genpath(currentPath));
 
             disp('Started saving simulator tests')
 
@@ -86,12 +87,10 @@ classdef TestSimulator < matlab.unittest.TestCase
             end
        
             save(filePath,'stateA','stateF', 'settings',...
-             'mission', 'rocket', 'environment', 'wind');
+             'rocket', 'environment', 'wind');
             
             Time = toc(Time);
             fprintf('\t %s test created in: %2.2f seconds\n',verifiable, Time)
-            
-            
          end
     end
 end