repository restructure

git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@2135 92a21009-5b66-0410-b83a-dc787c41c6e9

1004 files changed, 0 insertions, 0 deletions

diff --git a/org.eclipse.stem.tests.core/.classpath b/tests/org.eclipse.stem.tests.core/.classpath
index 304e86186..304e86186 100644
--- a/org.eclipse.stem.tests.core/.classpath
+++ b/tests/org.eclipse.stem.tests.core/.classpath
diff --git a/org.eclipse.stem.tests.core/.project b/tests/org.eclipse.stem.tests.core/.project
index 30e29bb32..30e29bb32 100644
--- a/org.eclipse.stem.tests.core/.project
+++ b/tests/org.eclipse.stem.tests.core/.project
diff --git a/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs
index e4d0cdf24..e4d0cdf24 100644
--- a/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF
index 9b1944f33..9b1944f33 100644
--- a/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.stem.tests.core/build.properties b/tests/org.eclipse.stem.tests.core/build.properties
index 69115587c..69115587c 100644
--- a/org.eclipse.stem.tests.core/build.properties
+++ b/tests/org.eclipse.stem.tests.core/build.properties
diff --git a/org.eclipse.stem.tests.core/epl-v10.html b/tests/org.eclipse.stem.tests.core/epl-v10.html
index ed4b19665..ed4b19665 100644
--- a/org.eclipse.stem.tests.core/epl-v10.html
+++ b/tests/org.eclipse.stem.tests.core/epl-v10.html
diff --git a/org.eclipse.stem.tests.core/notice.html b/tests/org.eclipse.stem.tests.core/notice.html
index c6af966b6..c6af966b6 100644
--- a/org.eclipse.stem.tests.core/notice.html
+++ b/tests/org.eclipse.stem.tests.core/notice.html
diff --git a/org.eclipse.stem.tests.core/plugin.properties b/tests/org.eclipse.stem.tests.core/plugin.properties
index 0b20cb563..0b20cb563 100644
--- a/org.eclipse.stem.tests.core/plugin.properties
+++ b/tests/org.eclipse.stem.tests.core/plugin.properties
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/.project b/tests/org.eclipse.stem.tests.core/resources/BasicTests/.project
index e047d522c..e047d522c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/.project
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/.project
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/E_2.csv
index bb426d609..bb426d609 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/I_2.csv
index a8b230ab4..a8b230ab4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Incidence_2.csv
index 4d5369001..4d5369001 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Population Count_2.csv
index 2ac5d1fef..2ac5d1fef 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/R_2.csv
index fc75047ae..fc75047ae 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/S_2.csv
index 54eb63481..54eb63481 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human0to0/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/E_2.csv
index 0ebb07686..0ebb07686 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/I_2.csv
index 87e4ef2e3..87e4ef2e3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Incidence_2.csv
index ae79fc35b..ae79fc35b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Population Count_2.csv
index 670bc73ab..670bc73ab 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/R_2.csv
index a7f6ed532..a7f6ed532 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/S_2.csv
index 7bbc86d6b..7bbc86d6b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human1to1/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/E_2.csv
index d72c06d83..d72c06d83 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/I_2.csv
index d32c5ab8c..d32c5ab8c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Incidence_2.csv
index c13d85956..c13d85956 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Population Count_2.csv
index 1cd655dab..1cd655dab 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/R_2.csv
index 1302ef3a6..1302ef3a6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/S_2.csv
index ff9f70af1..ff9f70af1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/human2to-/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/runparameters.csv
index 1b51a6c63..1b51a6c63 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AgingSEIRDisease_FD_Reference/AgingSEIRDisease/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/I_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Incidence_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Population Count_2.csv
index 82021bed5..82021bed5 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/S_2.csv
index 82021bed5..82021bed5 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human0to0/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/I_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Incidence_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Population Count_2.csv
index 20d43a800..20d43a800 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/S_2.csv
index 20d43a800..20d43a800 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human1to1/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/I_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Incidence_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Population Count_2.csv
index c1fd6b350..c1fd6b350 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/S_2.csv
index c1fd6b350..c1fd6b350 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/human2to-/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/runparameters.csv
index 38db279b4..38db279b4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/Aging_FD_Reference/NoDisease/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index a23b27d33..a23b27d33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/E_0.csv
index 21d171eea..21d171eea 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/I_0.csv
index d65e1f982..d65e1f982 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Incidence_0.csv
index 8b9512b8f..8b9512b8f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Population Count_0.csv
index 24219b727..24219b727 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/R_0.csv
index 9f4b421e4..9f4b421e4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/S_0.csv
index 981a6d7a4..981a6d7a4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index a23b27d33..a23b27d33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index cabf54782..cabf54782 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index a23b27d33..a23b27d33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index 4eb645f74..4eb645f74 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index d910b405a..d910b405a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index a23b27d33..a23b27d33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/E_0.csv
index a484ae5ba..a484ae5ba 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/I_0.csv
index eca347e43..eca347e43 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Incidence_0.csv
index a7dd3054f..a7dd3054f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Population Count_0.csv
index c01746835..c01746835 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/R_0.csv
index a4cd3c485..a4cd3c485 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/S_0.csv
index 912a7bd76..912a7bd76 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index a23b27d33..a23b27d33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index cabf54782..cabf54782 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index a23b27d33..a23b27d33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index 4eb645f74..4eb645f74 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index d910b405a..d910b405a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRSingleRegion_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_0.csv
index e5085ef1a..e5085ef1a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_1.csv
index 4b2010c13..4b2010c13 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_0.csv
index f4f9f1de1..f4f9f1de1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_1.csv
index 6f1dcd910..6f1dcd910 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_0.csv
index c7220e570..c7220e570 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_1.csv
index 00b9efc04..00b9efc04 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_0.csv
index 0b7565651..0b7565651 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_1.csv
index 2d57c9248..2d57c9248 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_0.csv
index 7b54ae92d..7b54ae92d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_1.csv
index 5e62611f7..5e62611f7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_0.csv
index 2e5c99221..2e5c99221 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_1.csv
index a55a2c78f..a55a2c78f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index d25002bec..d25002bec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
index 4590e6aa8..4590e6aa8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
index 6418b7285..6418b7285 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_0.csv
index 24b212826..24b212826 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_1.csv
index c9e65032b..c9e65032b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_0.csv
index a98528c7b..a98528c7b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_1.csv
index 28c4d123a..28c4d123a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_0.csv
index b01a8f859..b01a8f859 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_1.csv
index 5e56bf2ef..5e56bf2ef 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_0.csv
index b46e1f886..b46e1f886 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_1.csv
index ddf8c58a4..ddf8c58a4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_0.csv
index e05d05636..e05d05636 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_1.csv
index 1709f8a2a..1709f8a2a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_0.csv
index 2f86709c2..2f86709c2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_1.csv
index 56a92ae3a..56a92ae3a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index d25002bec..d25002bec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
index 4590e6aa8..4590e6aa8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
index 6418b7285..6418b7285 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_0.csv
index a734e2d4a..a734e2d4a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_1.csv
index 86c48eece..86c48eece 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_2.csv
index e3bf1846d..e3bf1846d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_0.csv
index 1a7977c30..1a7977c30 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_1.csv
index cb0b1e503..cb0b1e503 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_2.csv
index f88742672..f88742672 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
index a6f0ee547..a6f0ee547 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv
index 52a9004b0..52a9004b0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv
index ebcfe404a..ebcfe404a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
index 4eaa81425..4eaa81425 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv
index fac11675f..fac11675f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv
index ebe642971..ebe642971 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_0.csv
index 6ac980158..6ac980158 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_1.csv
index 5374a2894..5374a2894 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_2.csv
index 635cbe582..635cbe582 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_0.csv
index c24b4506c..c24b4506c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_1.csv
index 266d867a3..266d867a3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_2.csv
index 3c8397859..3c8397859 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index fe05096e8..fe05096e8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
index 53ce8a4f2..53ce8a4f2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_2.csv
index 1a5ba1fac..1a5ba1fac 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_2.csv
index 46d668742..46d668742 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_0.csv
index 2db393aa3..2db393aa3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_1.csv
index e74881ee3..e74881ee3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_2.csv
index ee22032db..ee22032db 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_0.csv
index 6e722388d..6e722388d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_1.csv
index 0a4e1f0b5..0a4e1f0b5 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_2.csv
index 9d8097f13..9d8097f13 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
index 765ca443b..765ca443b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv
index ba6275d20..ba6275d20 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv
index d43b001ba..d43b001ba 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
index 06f8cd1ea..06f8cd1ea 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv
index 8bd4cafcb..8bd4cafcb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv
index 8c1d17035..8c1d17035 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_0.csv
index a2d22476e..a2d22476e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_1.csv
index 52ff26548..52ff26548 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_2.csv
index 478c98f4c..478c98f4c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_0.csv
index 6f6d8f75d..6f6d8f75d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_1.csv
index e726d4b60..e726d4b60 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_2.csv
index ce1551d32..ce1551d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index fe05096e8..fe05096e8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
index 53ce8a4f2..53ce8a4f2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_2.csv
index 1a5ba1fac..1a5ba1fac 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_2.csv
index 46d668742..46d668742 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 6b1390c96..6b1390c96 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 54c0232e2..54c0232e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv
index 130d6e1cc..130d6e1cc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_0.csv
index 2cb722988..2cb722988 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_1.csv
index c80ba7176..c80ba7176 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_0.csv
index 480e93186..480e93186 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_1.csv
index 7802dbb4a..7802dbb4a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_0.csv
index 30ac28071..30ac28071 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_1.csv
index b4fbd5afe..b4fbd5afe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_0.csv
index f968bed37..f968bed37 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_1.csv
index a322bfd30..a322bfd30 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_0.csv
index e23dd92f2..e23dd92f2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_1.csv
index ed979ff11..ed979ff11 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/runparameters.csv
index 5ea2f5dd6..5ea2f5dd6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/TestSIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index d25002bec..d25002bec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
index 4590e6aa8..4590e6aa8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
index 6418b7285..6418b7285 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_0.csv
index 78eca0799..78eca0799 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_1.csv
index b70949bc2..b70949bc2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_0.csv
index eab6f805f..eab6f805f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_1.csv
index d111e670e..d111e670e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_0.csv
index 5e216019d..5e216019d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_1.csv
index 63eb65b5a..63eb65b5a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_0.csv
index 914841b28..914841b28 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_1.csv
index 6508dbc88..6508dbc88 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_0.csv
index 755028dc6..755028dc6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_1.csv
index 382bc119e..382bc119e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/runparameters.csv
index 5ea2f5dd6..5ea2f5dd6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/TestSIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index d25002bec..d25002bec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
index 4590e6aa8..4590e6aa8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
index 6418b7285..6418b7285 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIRStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_0.csv
index 48e2c93bc..48e2c93bc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_1.csv
index c68169690..c68169690 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_0.csv
index 4c8372fbf..4c8372fbf 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_1.csv
index 01cc70cec..01cc70cec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_0.csv
index 74e4a1770..74e4a1770 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_1.csv
index a4829e0fd..a4829e0fd 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_0.csv
index 648e8c114..648e8c114 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_1.csv
index 5fdec95a1..5fdec95a1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/runparameters.csv
index 0445ade9f..0445ade9f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/TestSI/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index d25002bec..d25002bec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
index 4590e6aa8..4590e6aa8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
index 6418b7285..6418b7285 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_0.csv
index c9300af4a..c9300af4a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_1.csv
index b354cdc44..b354cdc44 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_0.csv
index 4562aac01..4562aac01 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_1.csv
index 17fad6a67..17fad6a67 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_0.csv
index 0ba834aa0..0ba834aa0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_1.csv
index c1ebb24d2..c1ebb24d2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_0.csv
index e5fa18d7f..e5fa18d7f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_1.csv
index 728a34672..728a34672 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/runparameters.csv
index 0445ade9f..0445ade9f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/TestSI/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index d25002bec..d25002bec 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
index 4590e6aa8..4590e6aa8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
index 6418b7285..6418b7285 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 112e8b833..112e8b833 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 47a843fce..47a843fce 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/AirTransportSIStatesOnly_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Births_2.csv
index 39b94ad29..39b94ad29 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Count_2.csv
index 1fa76a2cb..1fa76a2cb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Deaths_2.csv
index 678993618..678993618 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Density_2.csv
index 7ae6d01da..7ae6d01da 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/men/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/runparameters.csv
index 2c19e1cd9..2c19e1cd9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Births_2.csv
index 39b94ad29..39b94ad29 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Count_2.csv
index 1fa76a2cb..1fa76a2cb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Deaths_2.csv
index 678993618..678993618 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Density_2.csv
index 7ae6d01da..7ae6d01da 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/DemographicModel/women/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/E_2.csv
index 9ba4a8209..9ba4a8209 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/I_2.csv
index 42483c1b1..42483c1b1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Incidence_2.csv
index d847a155f..d847a155f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Population Count_2.csv
index 6c5c2160f..6c5c2160f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/R_2.csv
index 07382cf93..07382cf93 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/S_2.csv
index 342b3986a..342b3986a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/men/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/runparameters.csv
index b981857fc..b981857fc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/E_2.csv
index 7e95ec824..7e95ec824 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/I_2.csv
index c4a893104..c4a893104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Incidence_2.csv
index 38e76ba68..38e76ba68 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Population Count_2.csv
index 313fd9f66..313fd9f66 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/R_2.csv
index e49523a35..e49523a35 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/S_2.csv
index 695aaacdd..695aaacdd 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_FD_Reference/Flu/women/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Births_2.csv
index aa522e539..aa522e539 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Count_2.csv
index a66c63099..a66c63099 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Deaths_2.csv
index 25a0633a6..25a0633a6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Density_2.csv
index 5aa31354b..5aa31354b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/men/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/runparameters.csv
index 48f4a13e6..48f4a13e6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Births_2.csv
index aa522e539..aa522e539 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Count_2.csv
index a66c63099..a66c63099 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Deaths_2.csv
index 25a0633a6..25a0633a6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Density_2.csv
index 5aa31354b..5aa31354b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/DemographicModel/women/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/E_2.csv
index 2959409d1..2959409d1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/I_2.csv
index 7225ed280..7225ed280 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Incidence_2.csv
index 10a5b62ca..10a5b62ca 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Population Count_2.csv
index c882755bf..c882755bf 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/R_2.csv
index c0b65e659..c0b65e659 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/S_2.csv
index 068a30fbb..068a30fbb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/men/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/runparameters.csv
index d74706fca..d74706fca 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/E_2.csv
index f104c4066..f104c4066 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/I_2.csv
index 61a515c56..61a515c56 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Incidence_2.csv
index baba406c9..baba406c9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Population Count_2.csv
index aabc1d95f..aabc1d95f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/R_2.csv
index 2b0451b4d..2b0451b4d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/S_2.csv
index e387d1ecc..e387d1ecc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/DemographicSEIRDisease_RK_Reference/Flu/women/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_2.csv
index 53780d121..53780d121 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_2.csv
index 19176e291..19176e291 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
index d6ddb9c1d..d6ddb9c1d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_2.csv
index 15c2762d7..15c2762d7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/runparameters.csv
index b295066f1..b295066f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/HumanPopulationModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_2.csv
index c13b5b58b..c13b5b58b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_2.csv
index 4035b20d0..4035b20d0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_2.csv
index c3791d9f6..c3791d9f6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_2.csv
index bebf5e768..bebf5e768 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_2.csv
index 73979f3a2..73979f3a2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_2.csv
index 3e41ec294..3e41ec294 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/runparameters.csv
index d7f98454f..d7f98454f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_2.csv
index 0aa27167f..0aa27167f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_2.csv
index 612fc388f..612fc388f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
index 02e3f2776..02e3f2776 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_2.csv
index 7a7d6257b..7a7d6257b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
index bdff12245..bdff12245 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/runparameters.csv
index b295066f1..b295066f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/HumanPopulationModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_2.csv
index 5636791e0..5636791e0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_2.csv
index 6054825aa..6054825aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_2.csv
index 173cea348..173cea348 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_2.csv
index b96d1aca6..b96d1aca6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_2.csv
index b3fdf678e..b3fdf678e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_2.csv
index 773419af2..773419af2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/runparameters.csv
index d7f98454f..d7f98454f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/InoculationTest_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_2.csv
index d85c62ad0..d85c62ad0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_2.csv
index 5ced3864d..5ced3864d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_2.csv
index e3fdd53be..e3fdd53be 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_2.csv
index 6d723c228..6d723c228 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_2.csv
index eee443e43..eee443e43 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_2.csv
index 2d5fda1b9..2d5fda1b9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_2.csv
index 7035d4396..7035d4396 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_2.csv
index 896f5a97a..896f5a97a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_2.csv
index f0eaa3171..f0eaa3171 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_2.csv
index 41a35443c..41a35443c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_2.csv
index f8cc1da23..f8cc1da23 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_2.csv
index cc43c5e33..cc43c5e33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_2.csv
index ce130bb1e..ce130bb1e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_2.csv
index edf97886f..edf97886f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/runparameters.csv
index 5813212aa..5813212aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_2.csv
index bf817dab7..bf817dab7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_2.csv
index b4cb2b836..b4cb2b836 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv
index d6aef9d32..d6aef9d32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/LargeMixMig_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_2.csv
index a638699f6..a638699f6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_2.csv
index 6f5e210ad..6f5e210ad 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
index b7b7a9840..b7b7a9840 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_2.csv
index 16e4f11b2..16e4f11b2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/runparameters.csv
index b295066f1..b295066f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/HumanPopulationModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
index 550e59d1e..550e59d1e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_2.csv
index e2526f4a7..e2526f4a7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_2.csv
index a54400446..a54400446 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_2.csv
index a87e56e1c..a87e56e1c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_2.csv
index 2d1805136..2d1805136 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_2.csv
index 3c4dbebad..3c4dbebad 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_2.csv
index 625d389e3..625d389e3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/runparameters.csv
index 2975363e0..2975363e0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_2.csv
index fc4da85eb..fc4da85eb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_2.csv
index 9a7a750fd..9a7a750fd 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
index ea0caf9ba..ea0caf9ba 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_2.csv
index 7c2b4a74d..7c2b4a74d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
index f1ef17c02..f1ef17c02 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/runparameters.csv
index b295066f1..b295066f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/HumanPopulationModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
index cbc164225..cbc164225 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_2.csv
index 7e8ed3caf..7e8ed3caf 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_2.csv
index a458c83c9..a458c83c9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_2.csv
index f772bbfb7..f772bbfb7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_2.csv
index 4de11f77c..4de11f77c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_2.csv
index 798c35e5f..798c35e5f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_2.csv
index 9d6c6e82c..9d6c6e82c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/runparameters.csv
index 2975363e0..2975363e0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/NonZeroMortalityRate_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_2.csv
index 53780d121..53780d121 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_2.csv
index 19176e291..19176e291 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
index d6ddb9c1d..d6ddb9c1d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_2.csv
index 15c2762d7..15c2762d7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/runparameters.csv
index b295066f1..b295066f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/HumanPopulationModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_2.csv
index 4562e9fc2..4562e9fc2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_2.csv
index f786c19d4..f786c19d4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv
index 5331f3e93..5331f3e93 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv
index 927a62887..927a62887 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_2.csv
index 5251918ca..5251918ca 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_2.csv
index 2707eaf47..2707eaf47 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/runparameters.csv
index d7f98454f..d7f98454f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_2.csv
index 0077e3639..0077e3639 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Births_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_2.csv
index 2b2468817..2b2468817 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
index 5c1d8504a..5c1d8504a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_2.csv
index 6f0fb2504..6f0fb2504 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Density_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
index 3351f4641..3351f4641 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/runparameters.csv
index b295066f1..b295066f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/HumanPopulationModel/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
index 4ad1a5bfe..4ad1a5bfe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Disease Deaths_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_2.csv
index d0d605ebc..d0d605ebc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/E_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_2.csv
index 45b5578ff..45b5578ff 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/I_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv
index b98ff6142..b98ff6142 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Incidence_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv
index f8a33df3c..f8a33df3c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/Population Count_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_2.csv
index b6a5493df..b6a5493df 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/R_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_0.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_1.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_1.csv
index 2c244016c..2c244016c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_1.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_1.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_2.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_2.csv
index ef7c8ab27..ef7c8ab27 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_2.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/human/S_2.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/runparameters.csv
index d7f98454f..d7f98454f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/PopulationGrowthSEIR_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/E_0.csv
index 8dacebde2..8dacebde2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/I_0.csv
index 6c498b6bc..6c498b6bc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
index bf607fe37..bf607fe37 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
index 2ebb6bd61..2ebb6bd61 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/R_0.csv
index e139e1da3..e139e1da3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/S_0.csv
index e7fe72788..e7fe72788 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/runparameters.csv
index bed8f5104..bed8f5104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index 8a2a7168b..8a2a7168b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index e97152ad6..e97152ad6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/E_0.csv
index d9363b699..d9363b699 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/I_0.csv
index 9059b4148..9059b4148 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
index 8b502f722..8b502f722 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
index 30bb92b7e..30bb92b7e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/R_0.csv
index 3ef1d4523..3ef1d4523 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/S_0.csv
index cbd79f9bd..cbd79f9bd 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/runparameters.csv
index bed8f5104..bed8f5104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index 8a2a7168b..8a2a7168b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index e97152ad6..e97152ad6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Disease Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/I_0.csv
index 945c2aa45..945c2aa45 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Incidence_0.csv
index c3c5cfb44..c3c5cfb44 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Population Count_0.csv
index bd9487882..bd9487882 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/R_0.csv
index a6e4c16ea..a6e4c16ea 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/S_0.csv
index 6b71bb3bb..6b71bb3bb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/runparameters.csv
index ba136cc21..ba136cc21 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/TestSIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index 8a2a7168b..8a2a7168b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index e97152ad6..e97152ad6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Disease Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/I_0.csv
index 0f6295a9c..0f6295a9c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Incidence_0.csv
index 5fd9b62ff..5fd9b62ff 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Population Count_0.csv
index 8f1e5ca56..8f1e5ca56 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/R_0.csv
index f5b3cc409..f5b3cc409 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/S_0.csv
index abbd50ca6..abbd50ca6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/runparameters.csv
index ba136cc21..ba136cc21 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/TestSIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index 8a2a7168b..8a2a7168b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index e97152ad6..e97152ad6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Disease Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/I_0.csv
index 35b5d701e..35b5d701e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Incidence_0.csv
index 7658790c0..7658790c0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Population Count_0.csv
index 584374568..584374568 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/S_0.csv
index 02cf22de5..02cf22de5 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/runparameters.csv
index 918c09cac..918c09cac 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/TestSI/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index 8a2a7168b..8a2a7168b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index e97152ad6..e97152ad6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Disease Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/I_0.csv
index 8713a709d..8713a709d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Incidence_0.csv
index 728172e38..728172e38 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Population Count_0.csv
index de7ecf57e..de7ecf57e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/S_0.csv
index 154d26c83..154d26c83 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/runparameters.csv
index 918c09cac..918c09cac 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/TestSI/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index 8a2a7168b..8a2a7168b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index e97152ad6..e97152ad6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index cfeb16624..cfeb16624 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/SingleSquareSI_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/E_0.csv
index 6ffad553c..6ffad553c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/I_0.csv
index 66b39101f..66b39101f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
index 5118c5ee0..5118c5ee0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
index 93190b2f3..93190b2f3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/R_0.csv
index 5c216c112..5c216c112 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/S_0.csv
index 83f14a003..83f14a003 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/runparameters.csv
index bed8f5104..bed8f5104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index b95516ae2..b95516ae2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index a625bcff4..a625bcff4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/E_0.csv
index f63842c33..f63842c33 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/I_0.csv
index 62fed89aa..62fed89aa 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
index 8d9380747..8d9380747 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
index 0a3f98931..0a3f98931 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/R_0.csv
index d472aa22c..d472aa22c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/S_0.csv
index 46e74b1bc..46e74b1bc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/runparameters.csv
index bed8f5104..bed8f5104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index b95516ae2..b95516ae2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index a625bcff4..a625bcff4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingMigrationSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/E_0.csv
index 460e61198..460e61198 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/I_0.csv
index d65ef2690..d65ef2690 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
index 961f958d7..961f958d7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
index 8c561ebf6..8c561ebf6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/R_0.csv
index 16253b9dd..16253b9dd 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/S_0.csv
index 6b4289f77..6b4289f77 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/runparameters.csv
index bed8f5104..bed8f5104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
index b95516ae2..b95516ae2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
index a625bcff4..a625bcff4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_FD_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Disease Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/E_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/E_0.csv
index a1b7955da..a1b7955da 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/E_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/E_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/I_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/I_0.csv
index 02a7a7b9e..02a7a7b9e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/I_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/I_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
index 23485ad03..23485ad03 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
index c0a7efced..c0a7efced 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/Population Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/R_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/R_0.csv
index e27be7b84..e27be7b84 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/R_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/R_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/S_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/S_0.csv
index 68dee1ff6..68dee1ff6 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/S_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/human/S_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/runparameters.csv
index bed8f5104..bed8f5104 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/TestSEIR/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Births_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
index b95516ae2..b95516ae2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Count_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Deaths_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
index a625bcff4..a625bcff4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Density_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
index 8307ca499..8307ca499 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/human/Incidence_0.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
index 06855b530..06855b530 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/Recorded Simulations/IntegrationTest/TwoSquaresMixingSEIR_RK_Reference/auto_gen_human_population_model/runparameters.csv
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingModel.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingModel.standard
index e3afd5a6e..e3afd5a6e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingModel.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingModel.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingSEIRDisease.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingSEIRDisease.standard
index 6fa853f0f..6fa853f0f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingSEIRDisease.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AgingSEIRDisease.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AllSquaresPopulationInitializer.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AllSquaresPopulationInitializer.standard
index 73ff23293..73ff23293 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AllSquaresPopulationInitializer.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/AllSquaresPopulationInitializer.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicPopModel.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicPopModel.standard
index 51ee7eb8b..51ee7eb8b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicPopModel.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicPopModel.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicSEIRDisease.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicSEIRDisease.standard
index 755135cc9..755135cc9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicSEIRDisease.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/DemographicSEIRDisease.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptHuman0to0Infector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptHuman0to0Infector.standard
index 7ae2a06b2..7ae2a06b2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptHuman0to0Infector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptHuman0to0Infector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInfector.standard
index 54084e491..54084e491 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInoculator.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInoculator.standard
index 6a037699c..6a037699c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInoculator.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptInoculator.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptWomenInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptWomenInfector.standard
index ebf72efbb..ebf72efbb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptWomenInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/EgyptWomenInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/GrowingPopulationModel.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/GrowingPopulationModel.standard
index a84e3495e..a84e3495e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/GrowingPopulationModel.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/GrowingPopulationModel.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia.standard
index a64ae805d..a64ae805d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia2.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia2.standard
index 5e99fb1ed..5e99fb1ed 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia2.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia2.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia3.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia3.standard
index 4eb906aef..4eb906aef 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia3.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectCalifornia3.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectKenya.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectKenya.standard
index 873c5ab5c..873c5ab5c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectKenya.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/InfectKenya.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/NoDisease.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/NoDisease.standard
index 817afb427..817afb427 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/NoDisease.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/NoDisease.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesInfector.standard
index a8ac4ae28..a8ac4ae28 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesSEIR.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesSEIR.standard
index 8f12541f0..8f12541f0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesSEIR.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/PhilippinesSEIR.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR.standard
index 4e456226c..4e456226c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR2.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR2.standard
index b209ae37f..b209ae37f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR2.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR2.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR3.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR3.standard
index 61381ca61..61381ca61 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR3.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR3.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR4.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR4.standard
index 0442c184a..0442c184a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR4.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SEIR4.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI.standard
index 9682b2b75..9682b2b75 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI2.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI2.standard
index 2cdb2c4dc..2cdb2c4dc 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI2.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SI2.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR.standard
index a9b46f4f1..a9b46f4f1 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR2.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR2.standard
index 51381cffe..51381cffe 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR2.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SIR2.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareMigrationPopulationInitializer.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareMigrationPopulationInitializer.standard
index aa83fc5c8..aa83fc5c8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareMigrationPopulationInitializer.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareMigrationPopulationInitializer.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquarePopulationInitializer.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquarePopulationInitializer.standard
index 71d8fc26b..71d8fc26b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquarePopulationInitializer.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquarePopulationInitializer.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSEIRInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSEIRInfector.standard
index 6f52f0c82..6f52f0c82 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSEIRInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSEIRInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIInfector.standard
index a4c824ada..a4c824ada 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIRInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIRInfector.standard
index d144a62f0..d144a62f0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIRInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/SingleSquareSIRInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/TwoSquaresSEIRInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/TwoSquaresSEIRInfector.standard
index 68eaedaeb..68eaedaeb 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/TwoSquaresSEIRInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/TwoSquaresSEIRInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenInfector.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenInfector.standard
index 448b74d70..448b74d70 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenInfector.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenInfector.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenSEIR.standard b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenSEIR.standard
index dc862c50b..dc862c50b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenSEIR.standard
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/decorators/YemenSEIR.standard
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/MigrationGraph.graph b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/MigrationGraph.graph
index 62972e96a..62972e96a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/MigrationGraph.graph
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/MigrationGraph.graph
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/SingleSquareGraph.graph b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/SingleSquareGraph.graph
index f0e30dd61..f0e30dd61 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/SingleSquareGraph.graph
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/SingleSquareGraph.graph
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresMigrationEdges.graph b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresMigrationEdges.graph
index 6da3c18a3..6da3c18a3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresMigrationEdges.graph
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresMigrationEdges.graph
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresWithMixing.graph b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresWithMixing.graph
index e2fbf5a48..e2fbf5a48 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresWithMixing.graph
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/graphs/TwoSquaresWithMixing.graph
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRModel.model
index 4de1d4b32..4de1d4b32 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRStatesOnly.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRStatesOnly.model
index 1b665f192..1b665f192 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRStatesOnly.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSEIRStatesOnly.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIRStatesOnly.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIRStatesOnly.model
index 83d49b572..83d49b572 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIRStatesOnly.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIRStatesOnly.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIStatesOnly.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIStatesOnly.model
index 1a8ddc135..1a8ddc135 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIStatesOnly.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportSIStatesOnly.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportStatesOnly.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportStatesOnly.model
index 6dcae58d5..6dcae58d5 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportStatesOnly.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/AirTransportStatesOnly.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingDiseaseModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingDiseaseModel.model
index 891460a5a..891460a5a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingDiseaseModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingDiseaseModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingModel.model
index 5810a7d77..5810a7d77 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptAgingModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicDiseaseModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicDiseaseModel.model
index 6208ab9c7..6208ab9c7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicDiseaseModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicDiseaseModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicModel.model
index c381ddd75..c381ddd75 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptDemographicModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptPopModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptPopModel.model
index db603832e..db603832e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptPopModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EgyptPopModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/EqyptModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EqyptModel.model
index a8c321800..a8c321800 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/EqyptModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/EqyptModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMig.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMig.model
index 1a7c3ae9d..1a7c3ae9d 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMig.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMig.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMigYemen.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMigYemen.model
index fa5a4db47..fa5a4db47 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMigYemen.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/LargeMixMigYemen.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/NonZeroMortalityRateModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/NonZeroMortalityRateModel.model
index 5bebb6896..5bebb6896 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/NonZeroMortalityRateModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/NonZeroMortalityRateModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/PopulationGrowthModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/PopulationGrowthModel.model
index 6811916e3..6811916e3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/PopulationGrowthModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/PopulationGrowthModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemKenya.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemKenya.model
index 7b1dbb162..7b1dbb162 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemKenya.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemKenya.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemSEIRModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemSEIRModel.model
index fdacc2a72..fdacc2a72 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemSEIRModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleRegionAirTransportSystemSEIRModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareModel.model
index aed70dfe0..aed70dfe0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSEIRModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSEIRModel.model
index 5e30c1663..5e30c1663 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSEIRModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSEIRModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIModel.model
index c643739e3..c643739e3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIRModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIRModel.model
index 6af518ba9..6af518ba9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIRModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/SingleSquareSIRModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationModel.model
index b86dbfe95..b86dbfe95 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationSEIRModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationSEIRModel.model
index 606cb2aad..606cb2aad 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationSEIRModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingMigrationSEIRModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingModel.model
index 547bd1f0c..547bd1f0c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingSEIRModel.model b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingSEIRModel.model
index c7facb789..c7facb789 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingSEIRModel.model
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/models/TwoSquaresMixingSEIRModel.model
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AgingSEIRDisease_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AgingSEIRDisease_FD.scenario
index dfae9b5f9..dfae9b5f9 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AgingSEIRDisease_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AgingSEIRDisease_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/Aging_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/Aging_FD.scenario
index 573a21b79..573a21b79 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/Aging_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/Aging_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_FD.scenario
index 2ee682704..2ee682704 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_RK.scenario
index 7285b614b..7285b614b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRSingleRegion_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_FD.scenario
index 528439baf..528439baf 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_RK.scenario
index d3808e0d4..d3808e0d4 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIRStatesOnly_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_FD.scenario
index 781bf645f..781bf645f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_RK.scenario
index 356352822..356352822 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSEIR_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_FD.scenario
index 3d0b38788..3d0b38788 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_RK.scenario
index 421e82798..421e82798 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIRStatesOnly_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_FD.scenario
index aa33cfc58..aa33cfc58 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_RK.scenario
index aa046473b..aa046473b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/AirTransportSIStatesOnly_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_FD.scenario
index e34e23f89..e34e23f89 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_RK.scenario
index 065ad613b..065ad613b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/DemographicSEIRDisease_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_FD.scenario
index 17b14bba3..17b14bba3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_RK.scenario
index d74be93e2..d74be93e2 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/InoculationTest_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_FD.scenario
index 59cac9a69..59cac9a69 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_RK.scenario
index 884cefd0e..884cefd0e 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/LargeMixMig_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_FD.scenario
index 6cb158d23..6cb158d23 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_RK.scenario
index 01fb68a95..01fb68a95 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/NonZeroMortalityRate_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_FD.scenario
index 1a2cde5a3..1a2cde5a3 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_RK.scenario
index 3397fb0ad..3397fb0ad 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/PopulationGrowthSEIR_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_FD.scenario
index cc2a42a05..cc2a42a05 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_RK.scenario
index 861e5775a..861e5775a 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSEIR_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_FD.scenario
index 73e48a2b8..73e48a2b8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_RK.scenario
index 5c560fcb0..5c560fcb0 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSIR_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_FD.scenario
index 625106ca7..625106ca7 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_RK.scenario
index 8114d0e3c..8114d0e3c 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/SingleSquareSI_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_FD.scenario
index d4147acd8..d4147acd8 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_RK.scenario
index 9be83998f..9be83998f 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingMigrationSEIR_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_FD.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_FD.scenario
index 56f442319..56f442319 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_FD.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_FD.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_RK.scenario b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_RK.scenario
index eb4a1a97b..eb4a1a97b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_RK.scenario
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/scenarios/TwoSquaresMixingSEIR_RK.scenario
diff --git a/org.eclipse.stem.tests.core/resources/BasicTests/sequencers/30DaySequencer.sequencer b/tests/org.eclipse.stem.tests.core/resources/BasicTests/sequencers/30DaySequencer.sequencer
index 53094921b..53094921b 100644
--- a/org.eclipse.stem.tests.core/resources/BasicTests/sequencers/30DaySequencer.sequencer
+++ b/tests/org.eclipse.stem.tests.core/resources/BasicTests/sequencers/30DaySequencer.sequencer
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryImplTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryImplTest.java
index 7fec51b17..7fec51b17 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryImplTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryImplTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryTest.java
index 6d9377213..6d9377213 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterFactoryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterTest.java
index f0ffc5133..f0ffc5133 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/history/HistoryProviderAdapterTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryImplTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryImplTest.java
index 1ca3344ed..1ca3344ed 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryImplTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryImplTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryTest.java
index 3e14b2354..3e14b2354 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterFactoryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterTest.java
index 856911eac..856911eac 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/adapters/time/TimeProviderAdapterTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonAllTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonAllTests.java
index b2252a49d..b2252a49d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonAllTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonAllTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonTests.java
index 251f8279f..251f8279f 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CommonTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/ComparableTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/ComparableTest.java
index 5f4595a04..5f4595a04 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/ComparableTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/ComparableTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CoreAllTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CoreAllTests.java
index 0c58d1a88..0c58d1a88 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CoreAllTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/CoreAllTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueListTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueListTest.java
index 7b2a01467..7b2a01467 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueListTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueListTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueMatrixTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueMatrixTest.java
index 4178548ab..4178548ab 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueMatrixTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueMatrixTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueTest.java
index bd80a9fed..bd80a9fed 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DoubleValueTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DublinCoreTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DublinCoreTest.java
index 03e32107d..03e32107d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DublinCoreTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/DublinCoreTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableFilterTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableFilterTest.java
index a26a9586e..a26a9586e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableFilterTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableFilterTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableImplTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableImplTest.java
index f9203da8f..f9203da8f 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableImplTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableImplTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableTest.java
index 4f2942880..4f2942880 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/IdentifiableTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/SanityCheckerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/SanityCheckerTest.java
index 9f372db1c..9f372db1c 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/SanityCheckerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/SanityCheckerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueListTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueListTest.java
index d456de994..d456de994 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueListTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueListTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueTest.java
index 0bdaf799c..0bdaf799c 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/common/tests/StringValueTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTest.java
index 5cd83cfc8..5cd83cfc8 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTests.java
index f16d2994b..f16d2994b 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/experiment/tests/ExperimentTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicEdgeLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicEdgeLabelTest.java
index 3afd982e7..3afd982e7 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicEdgeLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicEdgeLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicLabelTest.java
index 7223c057d..7223c057d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicNodeLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicNodeLabelTest.java
index 742adfeb7..742adfeb7 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicNodeLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/DynamicNodeLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeLabelTest.java
index ba2b65d7c..ba2b65d7c 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeTest.java
index 9f554cd38..9f554cd38 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/EdgeTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/ExchangeTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/ExchangeTest.java
index bd15110a0..bd15110a0 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/ExchangeTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/ExchangeTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphAllTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphAllTests.java
index 220f8f46c..220f8f46c 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphAllTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphAllTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphPartitionerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphPartitionerTest.java
index bb202f8b5..bb202f8b5 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphPartitionerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphPartitionerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTest.java
index 3d7462338..3d7462338 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTests.java
index f87f8cf7e..f87f8cf7e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTimeProviderAdapterFactoryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTimeProviderAdapterFactoryTest.java
index d8e11c96b..d8e11c96b 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTimeProviderAdapterFactoryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/GraphTimeProviderAdapterFactoryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelTest.java
index f2e97dc41..f2e97dc41 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelValueTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelValueTest.java
index 9ccb209a8..9ccb209a8 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelValueTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/IntegrationLabelValueTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelTest.java
index ad0ad97a0..ad0ad97a0 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelValueTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelValueTest.java
index 68847adbd..68847adbd 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelValueTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/LabelValueTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeLabelTest.java
index 81c36c8f1..81c36c8f1 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeTest.java
index 00aa3662b..00aa3662b 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/NodeTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SanityCheckerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SanityCheckerTest.java
index c35a7427a..c35a7427a 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SanityCheckerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SanityCheckerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SimpleGraphPartitionerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SimpleGraphPartitionerTest.java
index 8b56ce00d..8b56ce00d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SimpleGraphPartitionerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/SimpleGraphPartitionerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticEdgeLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticEdgeLabelTest.java
index 7b2f6b559..7b2f6b559 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticEdgeLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticEdgeLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticLabelTest.java
index 1e7f31e21..1e7f31e21 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticNodeLabelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticNodeLabelTest.java
index d3d44b144..d3d44b144 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticNodeLabelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/StaticNodeLabelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToEdgeMapEntryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToEdgeMapEntryTest.java
index 7297e56a6..7297e56a6 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToEdgeMapEntryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToEdgeMapEntryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToIdentifiableMapEntryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToIdentifiableMapEntryTest.java
index fd3815fbf..fd3815fbf 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToIdentifiableMapEntryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToIdentifiableMapEntryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToLabelMapEntryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToLabelMapEntryTest.java
index 1a1fa3182..1a1fa3182 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToLabelMapEntryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToLabelMapEntryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeLabelMapEntryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeLabelMapEntryTest.java
index ac728ffb2..ac728ffb2 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeLabelMapEntryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeLabelMapEntryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeMapEntryTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeMapEntryTest.java
index fb1d23c42..fb1d23c42 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeMapEntryTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/URIToNodeMapEntryTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/UnresolvedIdentifiableTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/UnresolvedIdentifiableTest.java
index 0b43b7cfe..0b43b7cfe 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/UnresolvedIdentifiableTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/graph/tests/UnresolvedIdentifiableTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ComparableTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ComparableTest.java
index 03555b247..03555b247 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ComparableTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ComparableTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/DecoratorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/DecoratorTest.java
index 10bc6a21e..10bc6a21e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/DecoratorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/DecoratorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/EdgeDecoratorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/EdgeDecoratorTest.java
index a7723371e..a7723371e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/EdgeDecoratorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/EdgeDecoratorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/GraphDecoratorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/GraphDecoratorTest.java
index 28f45be0a..28f45be0a 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/GraphDecoratorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/GraphDecoratorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/IntegrationDecoratorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/IntegrationDecoratorTest.java
index f21ddb6e2..f21ddb6e2 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/IntegrationDecoratorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/IntegrationDecoratorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelAllTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelAllTests.java
index fe1241841..fe1241841 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelAllTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelAllTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTest.java
index c655aba2a..c655aba2a 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTests.java
index 3b8b4a3f2..3b8b4a3f2 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/ModelTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/NodeDecoratorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/NodeDecoratorTest.java
index c7453da4e..c7453da4e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/NodeDecoratorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/NodeDecoratorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/STEMTimeTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/STEMTimeTest.java
index 4a7963a48..4a7963a48 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/STEMTimeTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/model/tests/STEMTimeTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleModifierTest.java
index b544d3874..b544d3874 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleNOPModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleNOPModifierTest.java
index ba03d9203..ba03d9203 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleNOPModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleNOPModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleRangeModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleRangeModifierTest.java
index a28fe47ff..a28fe47ff 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleRangeModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleRangeModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleSequenceModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleSequenceModifierTest.java
index 206ce9439..206ce9439 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleSequenceModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/DoubleSequenceModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/FeatureModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/FeatureModifierTest.java
index 62dbb69f9..62dbb69f9 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/FeatureModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/FeatureModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerModifierTest.java
index 33c78dbcd..33c78dbcd 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerNOPModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerNOPModifierTest.java
index b8be9b498..b8be9b498 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerNOPModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerNOPModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerRangeModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerRangeModifierTest.java
index fa13ff135..fa13ff135 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerRangeModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerRangeModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerSequenceModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerSequenceModifierTest.java
index 245786486..245786486 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerSequenceModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/IntegerSequenceModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongModifierTest.java
index 4a46db909..4a46db909 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongNOPModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongNOPModifierTest.java
index 03628df6f..03628df6f 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongNOPModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongNOPModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongRangeModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongRangeModifierTest.java
index 43010b111..43010b111 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongRangeModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongRangeModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongSequenceModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongSequenceModifierTest.java
index 7823c93a7..7823c93a7 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongSequenceModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/LongSequenceModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifiableTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifiableTest.java
index 8f358a101..8f358a101 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifiableTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifiableTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTest.java
index a6270332c..a6270332c 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTests.java
index 6e0778a1d..6e0778a1d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/ModifierTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/NOPModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/NOPModifierTest.java
index e8fa32667..e8fa32667 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/NOPModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/NOPModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/RangeModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/RangeModifierTest.java
index 718643018..718643018 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/RangeModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/RangeModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeModifierTest.java
index 8175a38ba..8175a38ba 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeNOPModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeNOPModifierTest.java
index 88dc93051..88dc93051 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeNOPModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeNOPModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeRangeModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeRangeModifierTest.java
index 82d5a6d57..82d5a6d57 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeRangeModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeRangeModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeSequenceModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeSequenceModifierTest.java
index e495d015a..e495d015a 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeSequenceModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/STEMTimeSequenceModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SequenceModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SequenceModifierTest.java
index 0a88053cb..0a88053cb 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SequenceModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SequenceModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SingleValueModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SingleValueModifierTest.java
index fd4ea730b..fd4ea730b 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SingleValueModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/SingleValueModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringNOPModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringNOPModifierTest.java
index 91ea7a096..91ea7a096 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringNOPModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringNOPModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringSequenceModifierTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringSequenceModifierTest.java
index a2e252e6f..a2e252e6f 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringSequenceModifierTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/modifier/tests/StringSequenceModifierTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/AndTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/AndTest.java
index 91c1b9035..91c1b9035 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/AndTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/AndTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanExpressionTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanExpressionTest.java
index 3d74c4f44..3d74c4f44 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanExpressionTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanExpressionTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanOperatorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanOperatorTest.java
index 60a311ab6..60a311ab6 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanOperatorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/BooleanOperatorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/ElapsedTimeTestTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/ElapsedTimeTestTest.java
index 20daa4485..20daa4485 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/ElapsedTimeTestTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/ElapsedTimeTestTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/FalseTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/FalseTest.java
index 4155cf39d..4155cf39d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/FalseTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/FalseTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateExpressionTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateExpressionTest.java
index c524083f9..c524083f9 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateExpressionTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateExpressionTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java
index de8c23d09..de8c23d09 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiableTestTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiableTestTest.java
index d24caecc1..d24caecc1 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiableTestTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiableTestTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NaryBooleanOperatorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NaryBooleanOperatorTest.java
index ed7acb9e4..ed7acb9e4 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NaryBooleanOperatorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NaryBooleanOperatorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NotTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NotTest.java
index db9a12801..db9a12801 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NotTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/NotTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/OrTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/OrTest.java
index 5da987b65..5da987b65 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/OrTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/OrTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateExpressionTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateExpressionTest.java
index d24d93e3d..d24d93e3d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateExpressionTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateExpressionTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java
index 43748775a..43748775a 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java
index 83b10153d..83b10153d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTests.java
index ee7499447..ee7499447 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TestTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TestTest.java
index d0c3744e6..d0c3744e6 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TestTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TestTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TimeTestTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TimeTestTest.java
index 15684d244..15684d244 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TimeTestTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TimeTestTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TrueTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TrueTest.java
index cc85c1d05..cc85c1d05 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TrueTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/TrueTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/UnaryBooleanOperatorTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/UnaryBooleanOperatorTest.java
index 766a56508..766a56508 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/UnaryBooleanOperatorTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/UnaryBooleanOperatorTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/IntegrationTestUtil.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/IntegrationTestUtil.java
index 4c0fed214..4c0fed214 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/IntegrationTestUtil.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/IntegrationTestUtil.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioAllTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioAllTests.java
index 9abc3430e..9abc3430e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioAllTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioAllTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationMultipleThreadsTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationMultipleThreadsTest.java
index 68d72a3dc..68d72a3dc 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationMultipleThreadsTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationMultipleThreadsTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationSingleThreadTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationSingleThreadTest.java
index ee47258df..ee47258df 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationSingleThreadTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationSingleThreadTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java
index e5accd023..e5accd023 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTests.java
index d44845eb1..d44845eb1 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioIntegrationTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTest.java
index a2151b3a1..a2151b3a1 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTests.java
index 9f463f12a..9f463f12a 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/scenario/tests/ScenarioTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/RealTimeSequencerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/RealTimeSequencerTest.java
index 7beb02867..7beb02867 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/RealTimeSequencerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/RealTimeSequencerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTest.java
index 3ae9f51d0..3ae9f51d0 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTests.java
index 1532c975d..1532c975d 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequencerTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequentialSequencerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequentialSequencerTest.java
index c57cbecc9..c57cbecc9 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequentialSequencerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/sequencer/tests/SequentialSequencerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverExample.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverExample.java
index 77e123aee..77e123aee 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverExample.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverExample.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTest.java
index 69027bd7e..69027bd7e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTests.java
index 9e1f5dc64..9e1f5dc64 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/solver/tests/SolverTests.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/Activator.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/Activator.java
index 002fccbc5..002fccbc5 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/Activator.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/Activator.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestConstants.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestConstants.java
index 16906a888..16906a888 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestConstants.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestConstants.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestLogPerformance.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestLogPerformance.java
index 98951aaa3..98951aaa3 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestLogPerformance.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/TestLogPerformance.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/util/Util.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/util/Util.java
index a1268e24e..a1268e24e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/util/Util.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/tests/util/Util.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTest.java
index 1f333da8b..1f333da8b 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTest.java
diff --git a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTests.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTests.java
index 81302112e..81302112e 100644
--- a/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTests.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/trigger/tests/TriggerTests.java
diff --git a/org.eclipse.stem.tests.core/temp/.cvsignore b/tests/org.eclipse.stem.tests.core/temp/.cvsignore
index 294fcb6c5..294fcb6c5 100644
--- a/org.eclipse.stem.tests.core/temp/.cvsignore
+++ b/tests/org.eclipse.stem.tests.core/temp/.cvsignore
diff --git a/org.eclipse.stem.tests.core/test.xml b/tests/org.eclipse.stem.tests.core/test.xml
index 7cd122303..7cd122303 100644
--- a/org.eclipse.stem.tests.core/test.xml
+++ b/tests/org.eclipse.stem.tests.core/test.xml