diff --git a/simulator/mainSimulator.m b/simulator/mainSimulator.m
index 9ec8e265e0d02d4551475d4cc7ff3bb490e5f522..fec14574cc185be8b2965778181290104c9f1f14 100644
--- a/simulator/mainSimulator.m
+++ b/simulator/mainSimulator.m
@@ -1,4 +1,4 @@
-function [ascent, descent, settings] = mainSimulator(rocket, wind, environment, settings, options)
+function [ascent, descent] = mainSimulator(rocket, wind, environment, settings, options)
 arguments
     rocket      = []    % Rocket      = Rocket.empty
     wind        = []    % Wind  = Wind.empty
diff --git a/unitTests/saveTests.m b/unitTests/saveTests.m
index 1da82a0c43303a6a26b06b924a10481c584c7736..2b6aede16b236e16aa74041b7294407e51754bc7 100644
--- a/unitTests/saveTests.m
+++ b/unitTests/saveTests.m
@@ -24,17 +24,13 @@ 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}, rocket, wind, environment, simSettings );
+        TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, rocket, wind, environment);
     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 0072ee266e6bdf7f61cb90e9a94c488f340492d3..aa4044a09c9ae8d37a15210dad0c3c4e08240159 100644
--- a/unitTests/tests/TestSimulator.m
+++ b/unitTests/tests/TestSimulator.m
@@ -55,12 +55,15 @@ classdef TestSimulator < matlab.unittest.TestCase
     end
 
     methods (Static)
-        function saveTest(verifiable, rocket, wind, environment, settings)
+        function saveTest(verifiable, rocket, wind, environment)
             Time = tic;
             currentPath = fileparts(mfilename('fullpath'));
 
             disp('Started saving simulator tests')
 
+            simPath = fullfile(fileparts(mfilename('fullpath')), '..', '..', 'simulator', 'simulatorConfig.m');
+            settings  = Settings('ode', simPath);
+
             if strcmp(verifiable, 'ballistic')
                 settings.simulator.ballistic = 1;
                 settings.simulator.parafoil = 0;
@@ -75,17 +78,15 @@ classdef TestSimulator < matlab.unittest.TestCase
             % end
            
             % simulator
-            [stateA, stateF, settings] = mainSimulator(rocket, wind, environment, settings, 'unitTest', true);
+            [stateA, stateF] = mainSimulator(rocket, wind, environment, settings, 'unitTest', true);
 
             % Save final state
             fileName = sprintf("referenceState_%s.mat", verifiable);
             folderPath = fullfile(currentPath, '..',  'data', 'testSimulator', verifiable);
             filePath = fullfile(folderPath, fileName);
 
-            if ~exist(folderPath, "dir")
-                mkdir(folderPath)
-            end
-       
+            if ~exist(folderPath, "dir"), mkdir(folderPath); end
+            
             save(filePath,'stateA','stateF', 'settings',...
              'rocket', 'environment', 'wind');