diff --git a/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat b/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat
index 026b1ae529cc4c4606b98f71101fb28e8097c52e..b5f9c2563d67b532c6f4319d1617ee410ef2a5af 100644
--- a/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat
+++ b/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbf1a2a08c2e412f580bb6080c03252451b950bcfdea85b10d8bc8b9b004167b
-size 80909350
+oid sha256:ab850cb272aeccddb4e1ff04f2b631d5edc512dcb2c1a23c71867ea6d1e0cc64
+size 80906846
diff --git a/unitTests/data/testSimulator/solid/referenceState_solid.mat b/unitTests/data/testSimulator/solid/referenceState_solid.mat
index 3f6dc484b5901df714b6f59dec63e17566ce58f5..d0cca1068352d7555e92bf842f8046948a80a3a6 100644
--- a/unitTests/data/testSimulator/solid/referenceState_solid.mat
+++ b/unitTests/data/testSimulator/solid/referenceState_solid.mat
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e87e622e0ac53cb9739316eaa723168f7a3496496b41e70989e80593d2d79b4
-size 80254417
+oid sha256:2f4fd7a5e5d2744080472a3a4be8445eff5b5018599c132bf3ee026848783502
+size 80311103
diff --git a/unitTests/mainUnitTest.m b/unitTests/mainUnitTest.m
index 0018eaedb10de00bf69671e86871dcc979e9ed86..c3d2ea497918bd670c26627465d91ce7d8fc7c8a 100644
--- a/unitTests/mainUnitTest.m
+++ b/unitTests/mainUnitTest.m
@@ -1,61 +1,45 @@
-function [apoResults, optResults,sensResults,simResults] = mainUnitTest(absToll,relToll,options)
+function [apoResults, optResults,sensResults,simResults] = mainUnitTest(options)
 arguments
-    absToll = [];
-    relToll = [];
     options.testApogeeAnalysis logical = [];
     options.testOptimization logical = [];
     options.testSensitivity logical = [];
     options.testSimulator logical = [];
 end
 %% PATH
-% main unit-test
-
 currentPath = fileparts(mfilename('fullpath'));
 addpath(genpath(fullfile(currentPath, '..')));
-%% LOAD OPTIONS
 
+%% LOAD OPTIONS
 settings = Settings('unitTest');
-Settings.read(settings, options, 'opt');
+Settings.read(settings, options, 'unitTest');
+
 %% TESTS
 beginTest = tic;
 
-% if opt.testCommonFunction
-%     test = TestCommonFunctions();
-%     testcmnfnctResults = run(test);
-%     disp(testcmnfnctResults);
-% end
-
-if settings.opt.testApogeeAnalysis
+if settings.unitTest.testApogeeAnalysis
     test = TestApogeeAnalysis();
-
     apoResults = run(test);
     disp(apoResults);
 end
 
-if settings.opt.testOptimization
-    test = TestOptimization();
-    optResults = run(test);
-    disp(optResults);
-end
+% if settings.unitTest.testOptimization
+%     test = TestOptimization();
+%     optResults = run(test);
+%     disp(optResults);
+% end
 
-if settings.opt.testSensitivity 
+if settings.unitTest.testSensitivity 
     test = TestSensitivity();
     sensResults = run(test);
     disp(sensResults);
 end
 
-if settings.opt.testSimulator
-    test = TestSimulator();
-    
-    if ~isempty(absToll), test.absToll = absToll; end
-    if ~isempty(relToll), test.relToll = relToll; end
-    
+if settings.unitTest.testSimulator
+    test = TestSimulator();    
     simResults = run(test);
     disp(simResults);
 end
 
 toc(beginTest)
 
-
-
 end
\ No newline at end of file
diff --git a/unitTests/saveTests.m b/unitTests/saveTests.m
index 127d9291ff32d91eda61e3a88a33145a1aeb43f5..7d2e3bece7b558422f3a2475db20de8f34b49670 100644
--- a/unitTests/saveTests.m
+++ b/unitTests/saveTests.m
@@ -12,9 +12,8 @@ end
 %% PATH
 currentPath = fileparts(mfilename('fullpath'));
 addpath(genpath(currentPath));
-
-
 totTime = tic;
+
 %% LOAD DATA / SETTINGS
 mission = Mission(true);
 if isempty(rocket), rocket  = Rocket(mission); end
@@ -25,49 +24,29 @@ if isempty(settings)
     %odePath = fullfile(fileparts(mfilename('fullpath')), '..', '..', 'common', 'settings ', 'odeConfig.m');
     settings  = Settings(simPath, 'ode','unitTest');
 end
-Settings.read(settings, options, 'opt');
-
-
-
+Settings.read(settings, options, 'unitTest');
 
 %% CREATING SIMULATOR TESTS
-if ~isempty(settings.opt.saveTestSimulator)
-    for k = 1:length(settings.opt.saveTestSimulator)
-        TestSimulator.saveTest(settings.opt.saveTestSimulator{k}, mission, rocket, wind, environment, settings );
+if ~isempty(settings.unitTest.saveTestSimulator)
+    for k = 1:length(settings.unitTest.saveTestSimulator)
+        TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, mission, rocket, wind, environment, settings );
     end
 end
 
-% %% TEST COMMONFUNCTIONS
-% if opt.createTestCommonFunction
-%     vars.mach = 0.05:0.05:1;
-%     vars.alpha = [-10 -7.5 -5 -2.5 -1 -0.5 -0.1 0 0.1 0.5 1 2.5 5 7.5 10];
-%     vars.beta = [-2.5 -0.1 0 0.1 2.5];
-%     vars.alt = (0:400:4000);
-%     vars.hprot = [];
-%     t = 1.3;
-%     alpha = 5;
-%     mach = 0.4;
-%     beta = 2;
-%     alt = 1145;
-%     c = 2;
-%     TestCommonFunctions.saveTest(mission, vars, t, alpha, mach, beta, alt, c);
-% end
-
 %% TEST APOGEE ANALYSIS
-if settings.opt.saveTestApogeeAnalysis
+if settings.unitTest.saveTestApogeeAnalysis
     TestApogeeAnalysis.saveTest(mission);
 end
 
-% %% SENSITIVITY ANALYSIS
-% if opt.createTestSensitivity
-%     TestSensitivity.saveTest(mission);
-% end
-
-%% OPTIMIZATION
-if settings.opt.saveTestOptimization
-    TestOptimization.saveTest(mission);
+%% SENSITIVITY ANALYSIS
+if settings.unitTest.saveTestSensitivity
+    TestSensitivity.saveTest(mission);
 end
 
+% %% OPTIMIZATION
+% if settings.unitTest.saveTestOptimization
+%     TestOptimization.saveTest(mission);
+% end
 
 totTimeF = toc(totTime);
 fprintf('\n\n All unit tests created in: %2.2f seconds\n\n', totTimeF)
diff --git a/unitTests/unitTestConfig.m b/unitTests/unitTestConfig.m
new file mode 100644
index 0000000000000000000000000000000000000000..31da7208df18d02bbe9ee5d8cee602d1d89a80fc
--- /dev/null
+++ b/unitTests/unitTestConfig.m
@@ -0,0 +1,15 @@
+% CONFIG - This script sets up rocket's parameters
+
+%% UNIT TESTS TO RUN
+% choose which folders to test
+unitTest.testSimulator = true;
+unitTest.testApogeeAnalysis = false;
+% unitTest.testOptimization = false;
+unitTest.testSensitivity = false;
+
+%% UNIT TEST TO CREATE
+% choose which folders to create data for
+unitTest.saveTestSimulator = {'multipleAB', 'ballistic', 'engineCut', 'solid', 'HRE'};       % Select the simulator tests to perform
+unitTest.saveTestApogeeAnalysis = false;
+% unitTest.saveTestOptimization = false;
+unitTest.saveTestSensitivity = false;
\ No newline at end of file