diff --git a/file_lists.mk b/file_lists.mk
index e79372e..0f9abdb 100644
--- a/file_lists.mk
+++ b/file_lists.mk
@@ -165,4 +165,3 @@
 	third_party/libuweave/src/macaroon_caveat.c \
 	third_party/libuweave/src/macaroon_context.c \
 	third_party/libuweave/src/macaroon_encoding.c
-
diff --git a/src/access_api_handler_unittest.cc b/src/access_api_handler_unittest.cc
index 3858722..44c83e2 100644
--- a/src/access_api_handler_unittest.cc
+++ b/src/access_api_handler_unittest.cc
@@ -169,11 +169,11 @@
   })";
   EXPECT_JSON_EQ(expected, *trait);
 
-  EXPECT_JSON_EQ((R"({
+  expected = R"({
     "capacity": 10,
     "size": 0
-  })"),
-                 *GetState());
+  })";
+  EXPECT_JSON_EQ(expected, *GetState());
 }
 
 TEST_F(AccessApiHandlerTest, Block) {
@@ -192,11 +192,12 @@
       'expirationTimeoutSec': 1234
     }
   })");
-  EXPECT_JSON_EQ((R"({
+
+  auto expected = R"({
     "capacity": 10,
     "size": 1
-  })"),
-                 *GetState());
+  })";
+  EXPECT_JSON_EQ(expected, *GetState());
 }
 
 TEST_F(AccessApiHandlerTest, Unblock) {
@@ -214,11 +215,12 @@
       'expirationTimeoutSec': 1234
     }
   })");
-  EXPECT_JSON_EQ((R"({
+
+  auto expected = R"({
     "capacity": 10,
     "size": 4
-  })"),
-                 *GetState());
+  })";
+  EXPECT_JSON_EQ(expected, *GetState());
 }
 
 TEST_F(AccessApiHandlerTest, List) {
@@ -239,11 +241,13 @@
     } ]
   })";
 
-  EXPECT_JSON_EQ(expected, AddCommand(R"({
+  const auto& results = AddCommand(R"({
     'name' : '_accessControlBlackList.list',
     'component': 'accessControl',
     'parameters': {
     }
-  })"));
+  })");
+
+  EXPECT_JSON_EQ(expected, results);
 }
 }  // namespace weave