diff --git a/tests/population/scaling/run_tests_astro1.sh b/tests/population/scaling/run_tests_astro1.sh
old mode 100644
new mode 100755
index 9770c6c72acbe413b2774604aad0c15ae5ffad03..c7198382706b352ccc9883f8af55f5594ff12557
--- a/tests/population/scaling/run_tests_astro1.sh
+++ b/tests/population/scaling/run_tests_astro1.sh
@@ -1,69 +1,72 @@
-python3 multiprocessing_via_population_comparison.py 1000 4 laptop
-python3 multiprocessing_via_population_comparison.py 1000 4 laptop
-python3 multiprocessing_via_population_comparison.py 1000 4 laptop
-python3 multiprocessing_via_population_comparison.py 1000 4 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 4 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 4 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 4 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 4 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 4 astro1
 
-python3 multiprocessing_via_population_comparison.py 1000 8 laptop
-python3 multiprocessing_via_population_comparison.py 1000 8 laptop
-python3 multiprocessing_via_population_comparison.py 1000 8 laptop
-python3 multiprocessing_via_population_comparison.py 1000 8 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 8 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 8 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 8 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 8 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 8 astro1
 
-python3 multiprocessing_via_population_comparison.py 2000 4 laptop
-python3 multiprocessing_via_population_comparison.py 2000 4 laptop
-python3 multiprocessing_via_population_comparison.py 2000 4 laptop
-python3 multiprocessing_via_population_comparison.py 2000 4 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 12 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 12 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 12 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 12 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 12 astro1
 
-python3 multiprocessing_via_population_comparison.py 2000 8 laptop
-python3 multiprocessing_via_population_comparison.py 2000 8 laptop
-python3 multiprocessing_via_population_comparison.py 2000 8 laptop
-python3 multiprocessing_via_population_comparison.py 2000 8 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 16 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 16 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 16 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 16 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 16 astro1
 
-python3 multiprocessing_via_population_comparison.py 2000 16 laptop
-python3 multiprocessing_via_population_comparison.py 2000 16 laptop
-python3 multiprocessing_via_population_comparison.py 2000 16 laptop
-python3 multiprocessing_via_population_comparison.py 2000 16 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 20 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 20 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 20 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 20 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 20 astro1
 
-python3 multiprocessing_via_population_comparison.py 2000 32 laptop
-python3 multiprocessing_via_population_comparison.py 2000 32 laptop
-python3 multiprocessing_via_population_comparison.py 2000 32 laptop
-python3 multiprocessing_via_population_comparison.py 2000 32 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 24 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 24 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 24 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 24 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 24 astro1
 
-python3 multiprocessing_via_population_comparison.py 5000 4 laptop
-python3 multiprocessing_via_population_comparison.py 5000 4 laptop
-python3 multiprocessing_via_population_comparison.py 5000 4 laptop
-python3 multiprocessing_via_population_comparison.py 5000 4 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 28 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 28 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 28 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 28 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 28 astro1
 
-python3 multiprocessing_via_population_comparison.py 5000 8 laptop
-python3 multiprocessing_via_population_comparison.py 5000 8 laptop
-python3 multiprocessing_via_population_comparison.py 5000 8 laptop
-python3 multiprocessing_via_population_comparison.py 5000 8 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 32 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 32 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 32 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 32 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 32 astro1
 
-python3 multiprocessing_via_population_comparison.py 5000 16 laptop
-python3 multiprocessing_via_population_comparison.py 5000 16 laptop
-python3 multiprocessing_via_population_comparison.py 5000 16 laptop
-python3 multiprocessing_via_population_comparison.py 5000 16 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 36 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 36 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 36 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 36 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 36 astro1
 
-python3 multiprocessing_via_population_comparison.py 5000 32 laptop
-python3 multiprocessing_via_population_comparison.py 5000 32 laptop
-python3 multiprocessing_via_population_comparison.py 5000 32 laptop
-python3 multiprocessing_via_population_comparison.py 5000 32 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 40 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 40 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 40 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 40 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 40 astro1
 
-python3 multiprocessing_via_population_comparison.py 10000 4 laptop
-python3 multiprocessing_via_population_comparison.py 10000 4 laptop
-python3 multiprocessing_via_population_comparison.py 10000 4 laptop
-python3 multiprocessing_via_population_comparison.py 10000 4 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 44 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 44 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 44 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 44 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 44 astro1
 
-python3 multiprocessing_via_population_comparison.py 10000 8 laptop
-python3 multiprocessing_via_population_comparison.py 10000 8 laptop
-python3 multiprocessing_via_population_comparison.py 10000 8 laptop
-python3 multiprocessing_via_population_comparison.py 10000 8 laptop
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 48 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 48 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 48 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 48 astro1
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 48 astro1
 
-python3 multiprocessing_via_population_comparison.py 10000 16 laptop
-python3 multiprocessing_via_population_comparison.py 10000 16 laptop
-python3 multiprocessing_via_population_comparison.py 10000 16 laptop
-python3 multiprocessing_via_population_comparison.py 10000 16 laptop
-
-python3 multiprocessing_via_population_comparison.py 10000 32 laptop
-python3 multiprocessing_via_population_comparison.py 10000 32 laptop
-python3 multiprocessing_via_population_comparison.py 10000 32 laptop
-python3 multiprocessing_via_population_comparison.py 10000 32 laptop
diff --git a/tests/population/scaling/run_tests_astro1_new.sh b/tests/population/scaling/run_tests_astro1_new.sh
deleted file mode 100755
index 5734e1de88a2004c89da6c5c608e7d84f26b4965..0000000000000000000000000000000000000000
--- a/tests/population/scaling/run_tests_astro1_new.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/bash
-python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
-
-#
-python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
-
-#
-python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
-
-#
-python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
-
-#
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-
-#
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
-
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
-
diff --git a/tests/population/scaling/run_tests_astro2.sh b/tests/population/scaling/run_tests_astro2.sh
new file mode 100755
index 0000000000000000000000000000000000000000..32bba71348fd9ce4dc78eb47e68b0e8bd17e0888
--- /dev/null
+++ b/tests/population/scaling/run_tests_astro2.sh
@@ -0,0 +1,72 @@
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 4 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 4 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 4 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 4 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 4 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 8 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 8 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 8 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 8 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 8 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 12 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 12 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 12 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 12 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 12 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 16 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 16 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 16 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 16 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 16 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 20 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 20 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 20 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 20 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 20 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 24 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 24 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 24 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 24 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 24 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 28 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 28 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 28 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 28 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 28 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 32 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 32 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 32 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 32 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 32 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 36 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 36 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 36 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 36 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 36 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 40 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 40 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 40 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 40 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 40 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 44 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 44 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 44 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 44 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 44 astro2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 48 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 48 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 48 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 48 astro2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 48 astro2
+
diff --git a/tests/population/scaling/run_tests_cluster2.sh b/tests/population/scaling/run_tests_cluster2.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ea560061eaaee0540e7f36eeca55a8ece9cc858f
--- /dev/null
+++ b/tests/population/scaling/run_tests_cluster2.sh
@@ -0,0 +1,60 @@
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 4 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 4 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 4 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 4 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 4 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 8 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 8 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 8 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 8 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 8 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 12 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 12 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 12 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 12 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 12 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 16 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 16 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 16 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 16 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 16 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 20 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 20 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 20 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 20 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 20 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 24 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 24 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 24 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 24 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 24 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 28 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 28 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 28 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 28 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 28 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 32 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 32 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 32 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 32 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 32 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 36 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 36 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 36 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 36 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 36 cluster2
+
+python3 evolve_population_comparing_with_multiprocessing.py 10 10 40 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 20 20 40 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 25 25 40 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 35 35 40 cluster2
+python3 evolve_population_comparing_with_multiprocessing.py 50 50 40 cluster2
+
diff --git a/tests/population/scaling/scaling_results/comparison_result_astro1.dat b/tests/population/scaling/scaling_results/comparison_result_astro1_ol.dat
similarity index 100%
rename from tests/population/scaling/scaling_results/comparison_result_astro1.dat
rename to tests/population/scaling/scaling_results/comparison_result_astro1_ol.dat
diff --git a/tests/population/scaling/scaling_results/comparison_result_astro2.dat b/tests/population/scaling/scaling_results/comparison_result_astro2.dat
new file mode 100644
index 0000000000000000000000000000000000000000..983ea6b77478721b535cefde5182212bdd4cbae0
--- /dev/null
+++ b/tests/population/scaling/scaling_results/comparison_result_astro2.dat
@@ -0,0 +1,60 @@
+(4, 100, 14.10124158859253, 4.134139060974121, 3.4109258011436787)
+(4, 400, 61.055301666259766, 16.35676121711731, 3.7327256206666113)
+(4, 625, 95.8083848953247, 25.765241622924805, 3.718512960114394)
+(4, 1225, 191.25050354003906, 50.95959973335266, 3.7529828440718127)
+(4, 2500, 383.6548960208893, 103.80896878242493, 3.6957779324925037)
+(8, 100, 14.198569297790527, 2.543941020965576, 5.581328018525103)
+(8, 400, 60.321287631988525, 9.967990159988403, 6.051499516333662)
+(8, 625, 94.71923232078552, 15.711591720581055, 6.028621033775345)
+(8, 1225, 194.1308672428131, 30.583381414413452, 6.34759330932983)
+(8, 2500, 384.8839490413666, 61.58411884307861, 6.249727304243525)
+(12, 100, 14.217102766036987, 1.9129226207733154, 7.432136883973698)
+(12, 400, 60.82681107521057, 7.934520483016968, 7.666097933127044)
+(12, 625, 96.70819783210754, 12.379796743392944, 7.811775898802247)
+(12, 1225, 190.89420461654663, 23.577396154403687, 8.096492223586456)
+(12, 2500, 397.2485320568085, 47.053948640823364, 8.442405866702568)
+(16, 100, 13.985195875167847, 1.8815627098083496, 7.432755656914745)
+(16, 400, 61.11527132987976, 6.59982705116272, 9.260132251361469)
+(16, 625, 95.90889692306519, 9.987864971160889, 9.602542405208117)
+(16, 1225, 188.9516725540161, 19.277790546417236, 9.801521190877999)
+(16, 2500, 382.5960810184479, 40.0679407119751, 9.548683416717282)
+(20, 100, 14.192401885986328, 1.5446226596832275, 9.188264717608712)
+(20, 400, 61.247467041015625, 5.625759840011597, 10.886967944385157)
+(20, 625, 97.97649145126343, 9.02974557876587, 10.850415506906703)
+(20, 1225, 190.2177484035492, 17.080851078033447, 11.136315604798853)
+(20, 2500, 383.7110228538513, 34.42068696022034, 11.147686369458649)
+(24, 100, 14.295984745025635, 1.7024154663085938, 8.397471139065784)
+(24, 400, 60.98009443283081, 5.706386089324951, 10.68628961978361)
+(24, 625, 95.29834866523743, 8.202463388442993, 11.618259558404093)
+(24, 1225, 188.30058526992798, 16.213704109191895, 11.613668536307898)
+(24, 2500, 392.8527772426605, 33.833460569381714, 11.611368468709959)
+(28, 100, 14.291304349899292, 1.5414564609527588, 9.27129939243693)
+(28, 400, 60.64618754386902, 5.269887685775757, 11.50806073297586)
+(28, 625, 95.23345041275024, 8.036301612854004, 11.85040768758916)
+(28, 1225, 186.29137110710144, 16.276238441467285, 11.445603465262794)
+(28, 2500, 394.3067514896393, 32.23271560668945, 12.233122281754206)
+(32, 100, 14.191281080245972, 1.571908950805664, 9.028055392758208)
+(32, 400, 61.429462909698486, 5.237022876739502, 11.729844294272707)
+(32, 625, 96.13259482383728, 8.995407342910767, 10.68685287493944)
+(32, 1225, 192.896910905838, 16.203189611434937, 11.904872777005988)
+(32, 2500, 399.2666940689087, 32.46242141723633, 12.299350345347715)
+(36, 100, 13.927229166030884, 1.5818688869476318, 8.804287941274838)
+(36, 400, 60.33647704124451, 5.5185840129852295, 10.933325813156557)
+(36, 625, 95.46581268310547, 8.636940717697144, 11.053197631366793)
+(36, 1225, 194.48183345794678, 16.411016941070557, 11.850687508050305)
+(36, 2500, 387.9849512577057, 32.95813179016113, 11.772055337600458)
+(40, 100, 13.982583284378052, 1.6111986637115479, 8.67837318842349)
+(40, 400, 61.04871916770935, 5.691144943237305, 10.726966151205225)
+(40, 625, 94.21784400939941, 7.811094522476196, 12.062054010265824)
+(40, 1225, 190.91827774047852, 16.066108465194702, 11.883293216529696)
+(40, 2500, 388.0709626674652, 33.429218769073486, 11.608735619824982)
+(44, 100, 14.21125054359436, 1.737048625946045, 8.18126236152688)
+(44, 400, 61.47734880447388, 5.915903806686401, 10.391877693310295)
+(44, 625, 94.16870713233948, 8.427074670791626, 11.174542864646696)
+(44, 1225, 190.71016192436218, 15.719615697860718, 12.131986276885632)
+(44, 2500, 392.2753930091858, 33.89833736419678, 11.572113074297995)
+(48, 100, 14.414173126220703, 1.5484826564788818, 9.308578992416557)
+(48, 400, 61.174304723739624, 5.360774040222168, 11.411468617170883)
+(48, 625, 95.53823685646057, 9.054794549942017, 10.551121434011153)
+(48, 1225, 190.91729140281677, 15.882095575332642, 12.020913140665199)
+(48, 2500, 392.0420844554901, 33.41745948791504, 11.73165436460742)
diff --git a/tests/population/scaling/scaling_results/comparison_result_cluster2.dat b/tests/population/scaling/scaling_results/comparison_result_cluster2.dat
new file mode 100644
index 0000000000000000000000000000000000000000..0b91382671aee48192ed7a6ec69bc911d9de6580
--- /dev/null
+++ b/tests/population/scaling/scaling_results/comparison_result_cluster2.dat
@@ -0,0 +1,50 @@
+(4, 100, 17.530393362045288, 4.754913568496704, 3.6867953769320843)
+(4, 400, 73.91634607315063, 19.321584463119507, 3.8255840877977714)
+(4, 625, 114.56839394569397, 30.45960521697998, 3.7613223523273636)
+(4, 1225, 231.09235262870789, 60.027222871780396, 3.8497925036833163)
+(4, 2500, 466.45902252197266, 122.86882734298706, 3.7963984243119464)
+(8, 100, 16.93968415260315, 2.813231945037842, 6.021431749515871)
+(8, 400, 73.41071081161499, 10.54165267944336, 6.9638711351938944)
+(8, 625, 111.85531425476074, 16.508870601654053, 6.775467380763997)
+(8, 1225, 225.93445348739624, 32.59254240989685, 6.93209049622316)
+(8, 2500, 460.64231610298157, 65.98871207237244, 6.980622922262476)
+(12, 100, 16.918346166610718, 2.0145938396453857, 8.397894321760027)
+(12, 400, 72.46919679641724, 7.917168617248535, 9.15342343960366)
+(12, 625, 114.03665566444397, 12.08104658126831, 9.439302704225812)
+(12, 1225, 228.76386547088623, 23.69902992248535, 9.652878882347748)
+(12, 2500, 468.6402156352997, 48.383867263793945, 9.685877589739237)
+(16, 100, 17.114651679992676, 1.863208293914795, 9.185581524024352)
+(16, 400, 72.29412269592285, 6.447221994400024, 11.213220633431982)
+(16, 625, 114.42502737045288, 10.020463705062866, 11.419134956063893)
+(16, 1225, 224.05144429206848, 19.879616022109985, 11.270411060398745)
+(16, 2500, 459.92475152015686, 39.26897215843201, 11.712166788185206)
+(20, 100, 17.14034938812256, 1.592360496520996, 10.764113669970431)
+(20, 400, 72.17513751983643, 6.184013605117798, 11.671244943592193)
+(20, 625, 116.0014705657959, 9.576918363571167, 12.112609313559998)
+(20, 1225, 229.0708658695221, 18.488805055618286, 12.389706375313486)
+(20, 2500, 465.14672780036926, 37.978049993515015, 12.247778068642175)
+(24, 100, 16.727715015411377, 1.609938621520996, 10.390281214328407)
+(24, 400, 73.3764419555664, 6.163752317428589, 11.904508516360663)
+(24, 625, 115.0853500366211, 9.489580869674683, 12.12754826763665)
+(24, 1225, 229.77985310554504, 18.294185161590576, 12.560267160079787)
+(24, 2500, 461.82390236854553, 36.947997093200684, 12.499294649277003)
+(28, 100, 16.906121969223022, 1.686905860900879, 10.021971208395968)
+(28, 400, 73.9054696559906, 6.208874225616455, 11.90319967363372)
+(28, 625, 116.12110328674316, 9.48776388168335, 12.239038063639141)
+(28, 1225, 228.12121391296387, 18.196850776672363, 12.536301842152058)
+(28, 2500, 466.3461253643036, 37.27383613586426, 12.511353102064888)
+(32, 100, 17.02801513671875, 1.699430227279663, 10.01983774525188)
+(32, 400, 72.43440103530884, 6.125530242919922, 11.825000965268398)
+(32, 625, 114.07859706878662, 9.18714451789856, 12.417198493670874)
+(32, 1225, 227.61294221878052, 18.364572763442993, 12.39413217779141)
+(32, 2500, 470.50201296806335, 37.635680198669434, 12.501488228308876)
+(36, 100, 16.765739679336548, 1.6341161727905273, 10.259821155007748)
+(36, 400, 71.90405225753784, 6.409330129623413, 11.218653245087664)
+(36, 625, 114.6719810962677, 9.576411962509155, 11.974420225988483)
+(36, 1225, 230.71015453338623, 18.751843690872192, 12.303331786286629)
+(36, 2500, 471.7755868434906, 37.441543102264404, 12.60032433906172)
+(40, 100, 16.983802556991577, 1.7513949871063232, 9.697299970609388)
+(40, 400, 73.24098634719849, 6.3537867069244385, 11.52713959808873)
+(40, 625, 114.03470826148987, 9.189575910568237, 12.409137197544357)
+(40, 1225, 228.31968879699707, 18.669682502746582, 12.229436079773071)
+(40, 2500, 460.6292335987091, 37.626529932022095, 12.242139640059928)