diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aef7c8d8d..a5f6a5dccd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - [[PR177]](https://github.com/lanl/singularity-eos/pull/177) added EOSPAC vector functions
 
 ### Changed (changing behavior/API/variables/...)
+- [[PR310]](https://github.com/lanl/singularity-eos/pull/310) Speed up and clean up tests
 - [[PR295]](https://github.com/lanl/singularity-eos/pull/295) Add fast logs to singularity-eos
 - [[PR246]](https://github.com/lanl/singularity-eos/pull/246) Update CMake with upstream changes
 - [[PR223]](https://github.com/lanl/singularity-eos/pull/223) Update ports-of-call and add portable error handling
diff --git a/test/eos_unit_test_helpers.hpp b/test/eos_unit_test_helpers.hpp
index a50206321a..a5616f83eb 100644
--- a/test/eos_unit_test_helpers.hpp
+++ b/test/eos_unit_test_helpers.hpp
@@ -71,7 +71,7 @@ inline void array_compare(int num, X &&x, Y &&y, Z &&z, ZT &&ztrue, XN xname, YN
   }
 }
 
-template<typename E1, typename E2>
+template <typename E1, typename E2>
 inline void compare_two_eoss(const E1 &&test_e, const E2 &&ref_e) {
   // compare all individual member functions with 1 as inputs,
   // this function is meant to catch mis-implementations of
diff --git a/test/profile_eos.cpp b/test/profile_eos.cpp
index 9eae5fa62b..dfdff7d6d1 100644
--- a/test/profile_eos.cpp
+++ b/test/profile_eos.cpp
@@ -66,7 +66,7 @@ inline double get_duration(Function function) {
   TODO(JMM): Only profiles Pressure call
   and does not accept lambdas.
 */
-template<typename EOS>
+template <typename EOS>
 inline void get_timing(int ncycles, const ivec &ncells_1d, const double rho_min,
                        const double rho_max, const double T_min, const double T_max,
                        const std::string &name, EOS &eos_h) {
@@ -221,7 +221,7 @@ int main(int argc, char *argv[]) {
               << "Beginning profiling..." << std::endl;
 
     constexpr Real Cv = 1e7 * 0.716; // specific heat in ergs/(g K)
-    constexpr Real gm1 = 0.4; // gamma - 1
+    constexpr Real gm1 = 0.4;        // gamma - 1
     auto eos = singularity::IdealGas(gm1, Cv);
     get_timing(ncycles, ncells_1d, RHO_MIN, RHO_MAX, T_MIN, T_MAX, "IdealGas", eos);
 
diff --git a/test/test_eos_modifiers.cpp b/test/test_eos_modifiers.cpp
index 74674f668d..2c6f9f3d29 100644
--- a/test/test_eos_modifiers.cpp
+++ b/test/test_eos_modifiers.cpp
@@ -27,11 +27,11 @@
 
 #include <test/eos_unit_test_helpers.hpp>
 
+using singularity::BilinearRampEOS;
 using singularity::EOS;
 using singularity::IdealGas;
 using singularity::ScaledEOS;
 using singularity::ShiftedEOS;
-using singularity::BilinearRampEOS;
 
 namespace EOSBuilder = singularity::EOSBuilder;
 namespace thermalqs = singularity::thermalqs;
@@ -274,4 +274,3 @@ SCENARIO("EOS Unit System", "[EOSBuilder][UnitSystem][IdealGas]") {
     }
   }
 }
-
diff --git a/test/test_eos_noble_abel.cpp b/test/test_eos_noble_abel.cpp
index b97dc833d7..c59fee244b 100644
--- a/test/test_eos_noble_abel.cpp
+++ b/test/test_eos_noble_abel.cpp
@@ -26,8 +26,8 @@
 #include <singularity-eos/eos/eos.hpp>
 #include <test/eos_unit_test_helpers.hpp>
 
-using singularity::NobleAbel;
 using singularity::IdealGas;
+using singularity::NobleAbel;
 using EOS = singularity::Variant<IdealGas, NobleAbel>;
 
 SCENARIO("NobleAbel1", "[NobleAbel][NobleAbel1]") {
diff --git a/test/test_eos_stiff.cpp b/test/test_eos_stiff.cpp
index 4e184aa29f..6871f0d406 100644
--- a/test/test_eos_stiff.cpp
+++ b/test/test_eos_stiff.cpp
@@ -25,8 +25,8 @@
 #include <singularity-eos/eos/eos.hpp>
 #include <test/eos_unit_test_helpers.hpp>
 
-using singularity::StiffGas;
 using singularity::IdealGas;
+using singularity::StiffGas;
 using EOS = singularity::Variant<IdealGas, StiffGas>;
 
 SCENARIO("StiffGas1", "[StiffGas][StiffGas1]") {