diff --git a/test/runtests.jl b/test/runtests.jl
index 6d084286c5..647243a3fc 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -10,73 +10,63 @@ using SafeTestsets, Test
 ### Run Tests ###
 @time begin
 
-    #if GROUP == "All" || GROUP == "ModelCreation"
-        # Tests the `ReactionSystem` structure and its properties.
-        @time @safetestset "Reaction Structure" begin include("reactionsystem_core/reaction.jl") end
-        @time @safetestset "ReactionSystem Structure" begin include("reactionsystem_core/reactionsystem.jl") end
-        @time @safetestset "Higher Order Reactions" begin include("reactionsystem_core/higher_order_reactions.jl") end
-        @time @safetestset "Symbolic Stoichiometry" begin include("reactionsystem_core/symbolic_stoichiometry.jl") end
-        @time @safetestset "Parameter Type Designation" begin include("reactionsystem_core/parameter_type_designation.jl") end
-        @time @safetestset "Custom CRN Functions" begin include("reactionsystem_core/custom_crn_functions.jl") end
-        # @time @safetestset "Coupled CRN/Equation Systems" begin include("reactionsystem_core/coupled_equation_crn_systems.jl") end
-        @time @safetestset "Events" begin include("reactionsystem_core/events.jl") end
-    
-        # Tests model creation via the @reaction_network DSL.
-        @time @safetestset "DSL Basic Model Construction" begin include("dsl/dsl_basic_model_construction.jl") end
-        @time @safetestset "DSL Advanced Model Construction" begin include("dsl/dsl_advanced_model_construction.jl") end
-        @time @safetestset "DSL Options" begin include("dsl/dsl_options.jl") end
+    # Tests the `ReactionSystem` structure and its properties.
+    @time @safetestset "Reaction Structure" begin include("reactionsystem_core/reaction.jl") end
+    @time @safetestset "ReactionSystem Structure" begin include("reactionsystem_core/reactionsystem.jl") end
+    @time @safetestset "Higher Order Reactions" begin include("reactionsystem_core/higher_order_reactions.jl") end
+    @time @safetestset "Symbolic Stoichiometry" begin include("reactionsystem_core/symbolic_stoichiometry.jl") end
+    @time @safetestset "Parameter Type Designation" begin include("reactionsystem_core/parameter_type_designation.jl") end
+    @time @safetestset "Custom CRN Functions" begin include("reactionsystem_core/custom_crn_functions.jl") end
+    # @time @safetestset "Coupled CRN/Equation Systems" begin include("reactionsystem_core/coupled_equation_crn_systems.jl") end
+    @time @safetestset "Events" begin include("reactionsystem_core/events.jl") end
 
-        # Tests compositional and hierarchical modelling.
-        @time @safetestset "ReactionSystem Components Based Creation" begin include("compositional_modelling/component_based_model_creation.jl") end
-    #end
+    # Tests model creation via the @reaction_network DSL.
+    @time @safetestset "DSL Basic Model Construction" begin include("dsl/dsl_basic_model_construction.jl") end
+    @time @safetestset "DSL Advanced Model Construction" begin include("dsl/dsl_advanced_model_construction.jl") end
+    @time @safetestset "DSL Options" begin include("dsl/dsl_options.jl") end
 
-    #if GROUP == "All" || GROUP == "Miscellaneous-NetworkAnalysis"
-        # Tests various miscellaneous features.
-        @time @safetestset "API" begin include("miscellaneous_tests/api.jl") end
-        @time @safetestset "Units" begin include("miscellaneous_tests/units.jl") end
-        @time @safetestset "Steady State Stability Computations" begin include("miscellaneous_tests/stability_computation.jl") end
-        @time @safetestset "Compound Species" begin include("miscellaneous_tests/compound_macro.jl") end
-        @time @safetestset "Reaction Balancing" begin include("miscellaneous_tests/reaction_balancing.jl") end
-        @time @safetestset "ReactionSystem Serialisation" begin include("miscellaneous_tests/reactionsystem_serialisation.jl") end
+    # Tests compositional and hierarchical modelling.
+    @time @safetestset "ReactionSystem Components Based Creation" begin include("compositional_modelling/component_based_model_creation.jl") end
 
-        # Tests reaction network analysis features.
-        @time @safetestset "Conservation Laws" begin include("network_analysis/conservation_laws.jl") end
-        @time @safetestset "Network Properties" begin include("network_analysis/network_properties.jl") end
-    #end
+    # Tests various miscellaneous features.
+    @time @safetestset "API" begin include("miscellaneous_tests/api.jl") end
+    @time @safetestset "Units" begin include("miscellaneous_tests/units.jl") end
+    @time @safetestset "Steady State Stability Computations" begin include("miscellaneous_tests/stability_computation.jl") end
+    @time @safetestset "Compound Species" begin include("miscellaneous_tests/compound_macro.jl") end
+    @time @safetestset "Reaction Balancing" begin include("miscellaneous_tests/reaction_balancing.jl") end
+    @time @safetestset "ReactionSystem Serialisation" begin include("miscellaneous_tests/reactionsystem_serialisation.jl") end
 
-    #if GROUP == "All" || GROUP == "Simulation"
-        # Tests ODE, SDE, jump simulations, nonlinear solving, and steady state simulations.
-        @time @safetestset "ODE System Simulations" begin include("simulation_and_solving/simulate_ODEs.jl") end
-        @time @safetestset "Automatic Jacobian Construction" begin include("simulation_and_solving/jacobian_construction.jl") end
-        @time @safetestset "SDE System Simulations" begin include("simulation_and_solving/simulate_SDEs.jl") end
-        @time @safetestset "Jump System Simulations" begin include("simulation_and_solving/simulate_jumps.jl") end
-        @time @safetestset "Nonlinear and SteadyState System Solving" begin include("simulation_and_solving/solve_nonlinear.jl") end
+    # Tests reaction network analysis features.
+    @time @safetestset "Conservation Laws" begin include("network_analysis/conservation_laws.jl") end
+    @time @safetestset "Network Properties" begin include("network_analysis/network_properties.jl") end
 
-        # Tests upstream SciML and DiffEq stuff.
-        @time @safetestset "MTK Structure Indexing" begin include("upstream/mtk_structure_indexing.jl") end
-        @time @safetestset "MTK Problem Inputs" begin include("upstream/mtk_problem_inputs.jl") end
-    #end
+    # Tests ODE, SDE, jump simulations, nonlinear solving, and steady state simulations.
+    @time @safetestset "ODE System Simulations" begin include("simulation_and_solving/simulate_ODEs.jl") end
+    @time @safetestset "Automatic Jacobian Construction" begin include("simulation_and_solving/jacobian_construction.jl") end
+    @time @safetestset "SDE System Simulations" begin include("simulation_and_solving/simulate_SDEs.jl") end
+    @time @safetestset "Jump System Simulations" begin include("simulation_and_solving/simulate_jumps.jl") end
+    @time @safetestset "Nonlinear and SteadyState System Solving" begin include("simulation_and_solving/solve_nonlinear.jl") end
 
-    #if GROUP == "All" || GROUP == "Spatial"
-        # Tests spatial modelling and simulations.
-        @time @safetestset "PDE Systems Simulations" begin include("spatial_modelling/simulate_PDEs.jl") end
-        @time @safetestset "Lattice Reaction Systems" begin include("spatial_modelling/lattice_reaction_systems.jl") end
-        @time @safetestset "ODE Lattice Systems Simulations" begin include("spatial_modelling/lattice_reaction_systems_ODEs.jl") end
-        @time @safetestset "Jump Lattice Systems Simulations" begin include("spatial_reaction_systems/lattice_reaction_systems_jumps.jl") end
-    #end
+    # Tests upstream SciML and DiffEq stuff.
+    @time @safetestset "MTK Structure Indexing" begin include("upstream/mtk_structure_indexing.jl") end
+    @time @safetestset "MTK Problem Inputs" begin include("upstream/mtk_problem_inputs.jl") end
 
-    #if GROUP == "All" || GROUP == "Visualisation-Extensions"
-        # Tests network visualisation.
-        @time @safetestset "Latexify" begin include("visualisation/latexify.jl") end
-        # Disable on Macs as can't install GraphViz via jll
-        if !Sys.isapple()
-            @time @safetestset "Graphs Visualisations" begin include("visualisation/graphs.jl") end
-        end
+    # Tests spatial modelling and simulations.
+    @time @safetestset "PDE Systems Simulations" begin include("spatial_modelling/simulate_PDEs.jl") end
+    @time @safetestset "Lattice Reaction Systems" begin include("spatial_modelling/lattice_reaction_systems.jl") end
+    @time @safetestset "ODE Lattice Systems Simulations" begin include("spatial_modelling/lattice_reaction_systems_ODEs.jl") end
+    @time @safetestset "Jump Lattice Systems Simulations" begin include("spatial_reaction_systems/lattice_reaction_systems_jumps.jl") end
 
-        # Tests extensions.
-        # @time @safetestset "BifurcationKit Extension" begin include("extensions/bifurcation_kit.jl") end
-        # @time @safetestset "HomotopyContinuation Extension" begin include("extensions/homotopy_continuation.jl") end
-        # @time @safetestset "Structural Identifiability Extension" begin include("extensions/structural_identifiability.jl") end
-    #end
+    # Tests network visualisation.
+    @time @safetestset "Latexify" begin include("visualisation/latexify.jl") end
+    # Disable on Macs as can't install GraphViz via jll
+    if !Sys.isapple()
+        @time @safetestset "Graphs Visualisations" begin include("visualisation/graphs.jl") end
+    end
+
+    # Tests extensions.
+    # @time @safetestset "BifurcationKit Extension" begin include("extensions/bifurcation_kit.jl") end
+    # @time @safetestset "HomotopyContinuation Extension" begin include("extensions/homotopy_continuation.jl") end
+    # @time @safetestset "Structural Identifiability Extension" begin include("extensions/structural_identifiability.jl") end
 
 end # @time