diff --git a/src/plugins/support/PythonSupport/tests/data/edgetests.out b/src/plugins/support/PythonSupport/tests/data/edgetests.out
index efa532da7c..eccd6d98e1 100755
--- a/src/plugins/support/PythonSupport/tests/data/edgetests.out
+++ b/src/plugins/support/PythonSupport/tests/data/edgetests.out
@@ -96,3 +96,263 @@
           - values(-1): [ 0.000000, 0.001000, 0.002000, ..., 49.998000, 49.999000, 50.000000 ]
           - values(0): [ 0.000000, 0.001000, 0.002000, ..., 49.998000, 49.999000, 50.000000 ]
           - values(1): n/a
+       - Test SimulationResults.constants():
+          - Size: 3
+          - Test main/sigma:
+             - Name: sigma
+             - Unit: dimensionless
+             - URI: main/sigma
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 10.000000
+             - value(0, -2): nan
+             - value(0, -1): 10.000000
+             - value(0, 0): 10.000000
+             - value(0, 1): nan
+             - value(50000): 10.000000
+             - value(50000, -2): nan
+             - value(50000, -1): 10.000000
+             - value(50000, 0): 10.000000
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 10.000000, 10.000000, 10.000000, ..., 10.000000, 10.000000, 10.000000 ]
+             - values(0): [ 10.000000, 10.000000, 10.000000, ..., 10.000000, 10.000000, 10.000000 ]
+             - values(1): n/a
+          - Test main/rho:
+             - Name: rho
+             - Unit: dimensionless
+             - URI: main/rho
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 28.000000
+             - value(0, -2): nan
+             - value(0, -1): 28.000000
+             - value(0, 0): 28.000000
+             - value(0, 1): nan
+             - value(50000): 28.000000
+             - value(50000, -2): nan
+             - value(50000, -1): 28.000000
+             - value(50000, 0): 28.000000
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 28.000000, 28.000000, 28.000000, ..., 28.000000, 28.000000, 28.000000 ]
+             - values(0): [ 28.000000, 28.000000, 28.000000, ..., 28.000000, 28.000000, 28.000000 ]
+             - values(1): n/a
+          - Test main/beta:
+             - Name: beta
+             - Unit: dimensionless
+             - URI: main/beta
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 2.666670
+             - value(0, -2): nan
+             - value(0, -1): 2.666670
+             - value(0, 0): 2.666670
+             - value(0, 1): nan
+             - value(50000): 2.666670
+             - value(50000, -2): nan
+             - value(50000, -1): 2.666670
+             - value(50000, 0): 2.666670
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 2.666670, 2.666670, 2.666670, ..., 2.666670, 2.666670, 2.666670 ]
+             - values(0): [ 2.666670, 2.666670, 2.666670, ..., 2.666670, 2.666670, 2.666670 ]
+             - values(1): n/a
+       - Test SimulationResults.states():
+          - Size: 3
+          - Test main/x:
+             - Name: x
+             - Unit: dimensionless
+             - URI: main/x
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 1.000000
+             - value(0, -2): nan
+             - value(0, -1): 1.000000
+             - value(0, 0): 1.000000
+             - value(0, 1): nan
+             - value(50000): 1.441809
+             - value(50000, -2): nan
+             - value(50000, -1): 1.441809
+             - value(50000, 0): 1.441809
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 1.000000, 1.000130, 1.000517, ..., 1.418729, 1.430217, 1.441809 ]
+             - values(0): [ 1.000000, 1.000130, 1.000517, ..., 1.418729, 1.430217, 1.441809 ]
+             - values(1): n/a
+          - Test main/y:
+             - Name: y
+             - Unit: dimensionless
+             - URI: main/y
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 1.000000
+             - value(0, -2): nan
+             - value(0, -1): 1.000000
+             - value(0, 0): 1.000000
+             - value(0, 1): nan
+             - value(50000): 2.606299
+             - value(50000, -2): nan
+             - value(50000, -1): 2.606299
+             - value(50000, 0): 2.606299
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 1.000000, 1.025989, 1.051961, ..., 2.562336, 2.584211, 2.606299 ]
+             - values(0): [ 1.000000, 1.025989, 1.051961, ..., 2.562336, 2.584211, 2.606299 ]
+             - values(1): n/a
+          - Test main/z:
+             - Name: z
+             - Unit: dimensionless
+             - URI: main/z
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 1.000000
+             - value(0, -2): nan
+             - value(0, -1): 1.000000
+             - value(0, 0): 1.000000
+             - value(0, 1): nan
+             - value(50000): 10.798812
+             - value(50000, -2): nan
+             - value(50000, -1): 10.798812
+             - value(50000, 0): 10.798812
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 1.000000, 0.998349, 0.996728, ..., 10.849148, 10.823916, 10.798812 ]
+             - values(0): [ 1.000000, 0.998349, 0.996728, ..., 10.849148, 10.823916, 10.798812 ]
+             - values(1): n/a
+       - Test SimulationResults.rates():
+          - Size: 3
+          - Test main/x/prime:
+             - Name: x'
+             - Unit: dimensionless/dimensionless
+             - URI: main/x/prime
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 0.000000
+             - value(0, -2): nan
+             - value(0, -1): 0.000000
+             - value(0, 0): 0.000000
+             - value(0, 1): nan
+             - value(50000): 11.644895
+             - value(50000, -2): nan
+             - value(50000, -1): 11.644895
+             - value(50000, 0): 11.644895
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 0.000000, 0.258590, 0.514440, ..., 11.436065, 11.539941, 11.644895 ]
+             - values(0): [ 0.000000, 0.258590, 0.514440, ..., 11.436065, 11.539941, 11.644895 ]
+             - values(1): n/a
+          - Test main/y/prime:
+             - Name: y'
+             - Unit: dimensionless/dimensionless
+             - URI: main/y/prime
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): 26.000000
+             - value(0, -2): nan
+             - value(0, -1): 26.000000
+             - value(0, 0): 26.000000
+             - value(0, 1): nan
+             - value(50000): 22.194533
+             - value(50000, -2): nan
+             - value(50000, -1): 22.194533
+             - value(50000, 0): 22.194533
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ 26.000000, 25.979173, 25.965265, ..., 21.770076, 21.981315, 22.194533 ]
+             - values(0): [ 26.000000, 25.979173, 25.965265, ..., 21.770076, 21.981315, 22.194533 ]
+             - values(1): n/a
+          - Test main/z/prime:
+             - Name: z'
+             - Unit: dimensionless/dimensionless
+             - URI: main/z/prime
+             - value(-1): nan
+             - value(-1, -2): nan
+             - value(-1, -1): nan
+             - value(-1, 0): nan
+             - value(-1, 1): nan
+             - value(0): -1.666670
+             - value(0, -2): nan
+             - value(0, -1): -1.666670
+             - value(0, 0): -1.666670
+             - value(0, 1): nan
+             - value(50000): -25.039083
+             - value(50000, -2): nan
+             - value(50000, -1): -25.039083
+             - value(50000, 0): -25.039083
+             - value(50000, 1): nan
+             - value(50001): nan
+             - value(50001, -2): nan
+             - value(50001, -1): nan
+             - value(50001, 0): nan
+             - value(50001, 1): nan
+             - values(-2): n/a
+             - values(-1): [ -1.666670, -1.636144, -1.605440, ..., -25.295837, -25.167829, -25.039083 ]
+             - values(0): [ -1.666670, -1.636144, -1.605440, ..., -25.295837, -25.167829, -25.039083 ]
+             - values(1): n/a
+       - Test SimulationResults.algebraic():
+          - Size: 0
diff --git a/src/plugins/support/PythonSupport/tests/data/edgetests.py b/src/plugins/support/PythonSupport/tests/data/edgetests.py
index 320b7edb71..a32dabb058 100755
--- a/src/plugins/support/PythonSupport/tests/data/edgetests.py
+++ b/src/plugins/support/PythonSupport/tests/data/edgetests.py
@@ -31,12 +31,24 @@ def edge_test_data_store_variable(variable, name, indent=''):
         print_values(variable.values(run - 2))
 
 
+def edge_test_data_store_variables(variables, name):
+    print('       - Test SimulationResults.%s():' % name)
+    print('          - Size: %d' % len(variables))
+
+    for uri, variable in variables.items():
+        edge_test_data_store_variable(variable, uri, '   ')
+
+
 def edge_test_simulation_results(simulation):
     print('    - Test the SimulationResults class:')
 
     results = simulation.results()
 
     edge_test_data_store_variable(results.voi(), 'SimulationResults.voi()')
+    edge_test_data_store_variables(results.constants(), 'constants')
+    edge_test_data_store_variables(results.states(), 'states')
+    edge_test_data_store_variables(results.rates(), 'rates')
+    edge_test_data_store_variables(results.algebraic(), 'algebraic')
 
 
 if __name__ == '__main__':