diff --git a/test/unit-kami-agentid.cc b/test/unit-kami-agentid.cc
index 5ff41dc..7180d8c 100644
--- a/test/unit-kami-agentid.cc
+++ b/test/unit-kami-agentid.cc
@@ -30,43 +30,34 @@
 
 using namespace kami;
 
-TEST(AgentID, DefaultConstructor) {
-    const AgentID agent_id_foo;
-    const AgentID agent_id_bar;
+class AgentIDTest : public ::testing::Test {
+protected:
+    AgentID agent_id_foo;
+    AgentID agent_id_bar;
+};
 
+TEST_F(AgentIDTest, DefaultConstructor) {
     EXPECT_EQ(agent_id_foo, agent_id_foo);
     EXPECT_NE(agent_id_foo, agent_id_bar);
 }
 
-TEST(AgentID, to_string) {
-    const AgentID agent_id_foo;
-    const AgentID agent_id_bar;
-
+TEST_F(AgentIDTest, to_string) {
     EXPECT_THAT(agent_id_foo.to_string(), testing::MatchesRegex("[0-9]+"));
     EXPECT_THAT(agent_id_bar.to_string(), testing::MatchesRegex("[0-9]+"));
 }
 
-TEST(AgentID, Equality) {
-    const AgentID agent_id_foo;
-    const AgentID agent_id_bar;
-
+TEST_F(AgentIDTest, equality) {
     EXPECT_TRUE(agent_id_foo == agent_id_foo);
     EXPECT_TRUE(agent_id_bar == agent_id_bar);
     EXPECT_FALSE(agent_id_foo == agent_id_bar);
 }
 
-TEST(AgentID, Inequality) {
-    const AgentID agent_id_foo;
-    const AgentID agent_id_bar;
-
+TEST_F(AgentIDTest, inequality) {
     EXPECT_TRUE(agent_id_foo != agent_id_bar);
     EXPECT_FALSE(agent_id_bar != agent_id_bar);
 }
 
-TEST(AgentID, Ordering) {
-    const AgentID agent_id_foo;
-    const AgentID agent_id_bar;
-
+TEST_F(AgentIDTest, ordering) {
     EXPECT_TRUE(agent_id_foo < agent_id_bar);
     EXPECT_FALSE(agent_id_bar < agent_id_foo);
 }
diff --git a/test/unit-kami-gridcoord1d.cc b/test/unit-kami-gridcoord1d.cc
index 26e961e..c36de6b 100644
--- a/test/unit-kami-gridcoord1d.cc
+++ b/test/unit-kami-gridcoord1d.cc
@@ -30,12 +30,15 @@
 
 using namespace kami;
 
-TEST(GridCoord1D, DefaultConstructor) {
-    const GridCoord1D gridcoord1d_foo(0);
-    const GridCoord1D gridcoord1d_bar(1);
-    const GridCoord1D gridcoord1d_baz(-1);
-    const GridCoord1D gridcoord1d_qux(0);
+class GridCoord1DTest : public ::testing::Test {
+protected:
+    GridCoord1D gridcoord1d_foo = GridCoord1D(0);
+    GridCoord1D gridcoord1d_bar = GridCoord1D(1);
+    GridCoord1D gridcoord1d_baz = GridCoord1D(-1);
+    GridCoord1D gridcoord1d_qux = GridCoord1D(0);
+};
 
+TEST_F(GridCoord1DTest, DefaultConstructor) {
     EXPECT_EQ(gridcoord1d_foo, gridcoord1d_foo);
     EXPECT_EQ(gridcoord1d_foo, gridcoord1d_qux);
 
@@ -44,22 +47,13 @@ TEST(GridCoord1D, DefaultConstructor) {
     EXPECT_NE(gridcoord1d_bar, gridcoord1d_baz);
 }
 
-TEST(GridCoord1D, to_string) {
-    const GridCoord1D gridcoord1d_foo(0);
-    const GridCoord1D gridcoord1d_bar(1);
-    const GridCoord1D gridcoord1d_baz(-1);
-
+TEST_F(GridCoord1DTest, to_string) {
     EXPECT_THAT(gridcoord1d_foo.to_string(), "(0)");
     EXPECT_THAT(gridcoord1d_bar.to_string(), "(1)");
     EXPECT_THAT(gridcoord1d_baz.to_string(), "(-1)");
 }
 
-TEST(GridCoord1D, Equality) {
-    const GridCoord1D gridcoord1d_foo(0);
-    const GridCoord1D gridcoord1d_bar(1);
-    const GridCoord1D gridcoord1d_baz(-1);
-    const GridCoord1D gridcoord1d_qux(0);
-
+TEST_F(GridCoord1DTest, equality) {
     EXPECT_TRUE(gridcoord1d_foo == gridcoord1d_foo);
     EXPECT_TRUE(gridcoord1d_foo == gridcoord1d_qux);
 
@@ -68,12 +62,7 @@ TEST(GridCoord1D, Equality) {
     EXPECT_FALSE(gridcoord1d_bar == gridcoord1d_baz);
 }
 
-TEST(GridCoord1D, Inequality) {
-    const GridCoord1D gridcoord1d_foo(0);
-    const GridCoord1D gridcoord1d_bar(1);
-    const GridCoord1D gridcoord1d_baz(-1);
-    const GridCoord1D gridcoord1d_qux(0);
-
+TEST_F(GridCoord1DTest, inequality) {
     EXPECT_FALSE(gridcoord1d_foo != gridcoord1d_foo);
     EXPECT_FALSE(gridcoord1d_foo != gridcoord1d_qux);
 
@@ -82,12 +71,7 @@ TEST(GridCoord1D, Inequality) {
     EXPECT_TRUE(gridcoord1d_bar != gridcoord1d_baz);
 }
 
-TEST(GridCoord1D, get_x_location) {
-    const GridCoord1D gridcoord1d_foo(0);
-    const GridCoord1D gridcoord1d_bar(1);
-    const GridCoord1D gridcoord1d_baz(-1);
-    const GridCoord1D gridcoord1d_qux(0);
-
+TEST_F(GridCoord1DTest, get_x_location) {
     EXPECT_TRUE(gridcoord1d_foo.get_x_location() == 0);
     EXPECT_TRUE(gridcoord1d_bar.get_x_location() == 1);
     EXPECT_TRUE(gridcoord1d_baz.get_x_location() == -1);
diff --git a/test/unit-kami-gridcoord2d.cc b/test/unit-kami-gridcoord2d.cc
index ceae253..18837c8 100644
--- a/test/unit-kami-gridcoord2d.cc
+++ b/test/unit-kami-gridcoord2d.cc
@@ -30,13 +30,16 @@
 
 using namespace kami;
 
-TEST(GridCoord2D, DefaultConstructor) {
-    const GridCoord2D gridcoord2d_foo(0, 0);
-    const GridCoord2D gridcoord2d_bar(1, 1);
-    const GridCoord2D gridcoord2d_baz(-1, -1);
-    const GridCoord2D gridcoord2d_qux(0, 1);
-    const GridCoord2D gridcoord2d_qu2(1, 0);
+class GridCoord2DTest : public ::testing::Test {
+protected:
+    GridCoord2D gridcoord2d_foo = GridCoord2D(0, 0);
+    GridCoord2D gridcoord2d_bar = GridCoord2D(1, 1);
+    GridCoord2D gridcoord2d_baz = GridCoord2D(-1, -1);
+    GridCoord2D gridcoord2d_qux = GridCoord2D(0, 1);
+    GridCoord2D gridcoord2d_qu2 = GridCoord2D(1, 0);
+};
 
+TEST_F(GridCoord2DTest, DefaultConstructor) {
     EXPECT_EQ(gridcoord2d_foo, gridcoord2d_foo);
 
     EXPECT_NE(gridcoord2d_foo, gridcoord2d_bar);
@@ -47,7 +50,7 @@ TEST(GridCoord2D, DefaultConstructor) {
 
 }
 
-TEST(GridCoord2D, to_string) {
+TEST_F(GridCoord2DTest, to_string) {
     const GridCoord2D gridcoord2d_foo(0, 0);
     const GridCoord2D gridcoord2d_bar(1, 1);
     const GridCoord2D gridcoord2d_baz(-1, -1);
@@ -61,7 +64,7 @@ TEST(GridCoord2D, to_string) {
     EXPECT_THAT(gridcoord2d_qu2.to_string(), "(1, 0)");
 }
 
-TEST(GridCoord2D, Equality) {
+TEST_F(GridCoord2DTest, Equality) {
     const GridCoord2D gridcoord2d_foo(0, 0);
     const GridCoord2D gridcoord2d_bar(1, 1);
     const GridCoord2D gridcoord2d_baz(-1, -1);
@@ -78,7 +81,7 @@ TEST(GridCoord2D, Equality) {
     EXPECT_FALSE(gridcoord2d_qux == gridcoord2d_qu2);
 }
 
-TEST(GridCoord2D, Inequality) {
+TEST_F(GridCoord2DTest, Inequality) {
     const GridCoord2D gridcoord2d_foo(0, 0);
     const GridCoord2D gridcoord2d_bar(1, 1);
     const GridCoord2D gridcoord2d_baz(-1, -1);
@@ -94,7 +97,7 @@ TEST(GridCoord2D, Inequality) {
     EXPECT_TRUE(gridcoord2d_qux != gridcoord2d_qu2);
 }
 
-TEST(GridCoord2D, get_x_location) {
+TEST_F(GridCoord2DTest, get_x_location) {
     const GridCoord2D gridcoord2d_foo(0, 0);
     const GridCoord2D gridcoord2d_bar(1, 1);
     const GridCoord2D gridcoord2d_baz(-1, -1);
@@ -118,7 +121,7 @@ TEST(GridCoord2D, get_x_location) {
     EXPECT_FALSE(gridcoord2d_qux.get_x_location() == gridcoord2d_qu2.get_x_location());
 }
 
-TEST(GridCoord2D, get_y_location) {
+TEST_F(GridCoord2DTest, get_y_location) {
     const GridCoord2D gridcoord2d_foo(0, 0);
     const GridCoord2D gridcoord2d_bar(1, 1);
     const GridCoord2D gridcoord2d_baz(-1, -1);
@@ -146,4 +149,3 @@ int main(int argc, char **argv) {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }
-
diff --git a/test/unit-kami-reporter.cc b/test/unit-kami-reporter.cc
index 1ba1479..f862239 100644
--- a/test/unit-kami-reporter.cc
+++ b/test/unit-kami-reporter.cc
@@ -104,7 +104,7 @@ TEST_F(ReporterModelTest, collect) {
 
     auto rval = mod->collect();
     EXPECT_TRUE(rval);
-    EXPECT_TRUE(rval.value()->dump() == "{\"fname\":\"Walter\",\"lname\":\"White\"}");
+    EXPECT_EQ(rval.value()->dump(), "{\"fname\":\"Walter\",\"lname\":\"White\"}");
 }
 
 TEST_F(ReporterModelTest, report) {
@@ -116,8 +116,8 @@ TEST_F(ReporterModelTest, report) {
     }
 
     auto rval = mod->report();
-    EXPECT_TRUE(rval->dump() ==
-                "[{\"agent_data\":[{\"agent_id\":\"13\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"14\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"15\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}}],\"model_data\":{\"fname\":\"Walter\",\"lname\":\"White\"},\"step_id\":1},{\"agent_data\":[{\"agent_id\":\"13\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"14\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"15\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}}],\"model_data\":{\"fname\":\"Walter\",\"lname\":\"White\"},\"step_id\":2}]");
+    EXPECT_EQ(rval->dump(),
+              "[{\"agent_data\":[{\"agent_id\":\"13\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"14\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"15\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}}],\"model_data\":{\"fname\":\"Walter\",\"lname\":\"White\"},\"step_id\":1},{\"agent_data\":[{\"agent_id\":\"13\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"14\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}},{\"agent_id\":\"15\",\"data\":{\"fname\":\"Jesse\",\"lname\":\"Pinkman\"}}],\"model_data\":{\"fname\":\"Walter\",\"lname\":\"White\"},\"step_id\":2}]");
 }
 
 int main(int argc, char **argv) {