diff --git a/tests/composition/compositionTest.cpp b/tests/composition/compositionTest.cpp
index afb0a0f..7553162 100644
--- a/tests/composition/compositionTest.cpp
+++ b/tests/composition/compositionTest.cpp
@@ -25,13 +25,13 @@ TEST_F(compositionTest, isotopeMasses) {
 }
 
 TEST_F(compositionTest, constructor) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    EXPECT_NO_THROW(composition::Composition comp);
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    EXPECT_NO_THROW(serif::composition::Composition comp);
 }
 
 TEST_F(compositionTest, registerSymbol) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     EXPECT_NO_THROW(comp.registerSymbol("H-1"));
     EXPECT_NO_THROW(comp.registerSymbol("He-4"));
     EXPECT_THROW(comp.registerSymbol("H-19"), std::runtime_error);
@@ -45,8 +45,8 @@ TEST_F(compositionTest, registerSymbol) {
 }
 
 TEST_F(compositionTest, setGetComposition) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
 
@@ -71,8 +71,8 @@ TEST_F(compositionTest, setGetComposition) {
 }
 
 TEST_F(compositionTest, setGetNumberFraction) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1", false);
     comp.registerSymbol("He-4", false);
 
@@ -88,8 +88,8 @@ TEST_F(compositionTest, setGetNumberFraction) {
 }
 
 TEST_F(compositionTest, subset) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
     comp.setMassFraction("H-1", 0.6);
@@ -97,14 +97,14 @@ TEST_F(compositionTest, subset) {
     EXPECT_NO_THROW(comp.finalize());
 
     std::vector<std::string> symbols = {"H-1"};
-    composition::Composition subsetComp = comp.subset(symbols, "norm");
+    serif::composition::Composition subsetComp = comp.subset(symbols, "norm");
     EXPECT_TRUE(subsetComp.finalize());
     EXPECT_DOUBLE_EQ(subsetComp.getMassFraction("H-1"), 1.0);
 }
 
 TEST_F(compositionTest, finalizeWithNormalization) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
     comp.setMassFraction("H-1", 0.3);
@@ -115,8 +115,8 @@ TEST_F(compositionTest, finalizeWithNormalization) {
 }
 
 TEST_F(compositionTest, finalizeWithoutNormalization) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
     comp.setMassFraction("H-1", 0.5);
@@ -127,8 +127,8 @@ TEST_F(compositionTest, finalizeWithoutNormalization) {
 }
 
 TEST_F(compositionTest, getComposition) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
     comp.setMassFraction("H-1", 0.6);
@@ -142,8 +142,8 @@ TEST_F(compositionTest, getComposition) {
 }
 
 TEST_F(compositionTest, setCompositionMode) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
     comp.setMassFraction("H-1", 0.6);
@@ -164,8 +164,8 @@ TEST_F(compositionTest, setCompositionMode) {
 }
 
 TEST_F(compositionTest, hasSymbol) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp;
     comp.registerSymbol("H-1");
     comp.registerSymbol("He-4");
     comp.setMassFraction("H-1", 0.6);
@@ -179,27 +179,27 @@ TEST_F(compositionTest, hasSymbol) {
 }
 
 TEST_F(compositionTest, mix) {
-    Config::getInstance().loadConfig(EXAMPLE_FILENAME);
-    composition::Composition comp1;
+    serif::config::Config::getInstance().loadConfig(EXAMPLE_FILENAME);
+    serif::composition::Composition comp1;
     comp1.registerSymbol("H-1");
     comp1.registerSymbol("He-4");
     comp1.setMassFraction("H-1", 0.6);
     comp1.setMassFraction("He-4", 0.4);
     EXPECT_NO_THROW(comp1.finalize());
 
-    composition::Composition comp2;
+    serif::composition::Composition comp2;
     comp2.registerSymbol("H-1");
     comp2.registerSymbol("He-4");
     comp2.setMassFraction("H-1", 0.4);
     comp2.setMassFraction("He-4", 0.6);
     EXPECT_NO_THROW(comp2.finalize());
 
-    composition::Composition mixedComp = comp1 + comp2;
+    serif::composition::Composition mixedComp = comp1 + comp2;
     EXPECT_TRUE(mixedComp.finalize());
     EXPECT_DOUBLE_EQ(mixedComp.getMassFraction("H-1"), 0.5);
     EXPECT_DOUBLE_EQ(mixedComp.getMassFraction("He-4"), 0.5);
 
-    composition::Composition mixedComp2 = comp1.mix(comp2, 0.25);
+    serif::composition::Composition mixedComp2 = comp1.mix(comp2, 0.25);
     EXPECT_TRUE(mixedComp2.finalize());
     EXPECT_DOUBLE_EQ(mixedComp2.getMassFraction("H-1"), 0.45);
     EXPECT_DOUBLE_EQ(mixedComp2.getMassFraction("He-4"), 0.55);