diff --git a/test/kpp/test_kpp_to_micm.cpp b/test/kpp/test_kpp_to_micm.cpp
index 20489b4f9..f89bf25d0 100644
--- a/test/kpp/test_kpp_to_micm.cpp
+++ b/test/kpp/test_kpp_to_micm.cpp
@@ -51,18 +51,26 @@ int main(const int argc, const char *argv[])
 
   micm::State state = solver.GetState();
 
+  double unit_conversion = 1.0e6 / 6.023e23; // convert molecules cm-3 to mol m-3
+
   // from Seinfeld and Pandas 3rd ed. table 5.1 p.121, z = 30 km
   state.conditions_[0].temperature_ = 227.0;  // K
   state.conditions_[0].pressure_ = 1200.0;    // Pa
 
+  double N_Avogadro = 6.02214076e23;
+  // molecules cm-3 -> mol m-3, S&P3e table 5.1, z = 30 km
+  double n_M = 3.1e17 * 1.0e6 / N_Avogadro;
+  // typical [O3] mid-latitude z ~ 30 km
+  double n_O3 = 2.0e12 * 1.0e6 / N_Avogadro;
+
   std::unordered_map<std::string, std::vector<double>> intial_concentration = {
-    { "M",   { 3.1e17 } },  // molecules cm-3, S&P3e table 5.1, z = 30 km
-    { "O2",  { 6.5e16 } },  // [O2] ~ 0.21 [M]
-    { "O3",  { 2.0e12 } },  // typical [O3] mid-latitude z ~ 30 km
-    { "O",   { 6.0e7 } },   // [O] / [O3] ~ 3e-5, S&P3e p.124
-    { "O1D", { 0.0 } },     //
-    { "NO2", { 8.0e8 } },   // ~ 8 ppb
-    { "NO",  { 4.0e8 } },   // ~ 4 ppb
+    { "M",   { n_M} },
+    { "O2",  { 0.21 * n_M } },  // [O2] ~ 0.21 [M]
+    { "O3",  { n_O3 } },
+    { "O",   { 3.0e-5 * n_O3 } },  // [O] / [O3] ~ 3e-5, S&P3e p.124
+    { "O1D", { 0.0 } },
+    { "NO2", { 8.0e-9 * n_M } },  // ~ 8 ppb
+    { "NO",  { 4.0e-9 * n_M} },   // ~ 4 ppb
   };
 
   state.SetConcentrations(solver_params.system_, intial_concentration);