diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 2a89a28..fa5b635 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -51,7 +51,6 @@
 // Length of argv[0] - Length of script dir
 #define EXECUTABLE_FILE_NAME_LENGTH 19
 
-
 // Current time, microseconds since the epoch
 uint64_t now() {
   int64_t ret;
diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
index 2705064..526cb0b 100644
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -418,7 +418,8 @@
     cob(res);
   }
 
-  virtual void testBinary(tcxx::function<void(std::string const& _return)> cob, const std::string& thing) {
+  virtual void testBinary(tcxx::function<void(std::string const& _return)> cob,
+                          const std::string& thing) {
     std::string res;
     _delegate->testBinary(res, thing);
     cob(res);
diff --git a/test/crossrunner/collect.py b/test/crossrunner/collect.py
index 6c771b3..145afef 100644
--- a/test/crossrunner/collect.py
+++ b/test/crossrunner/collect.py
@@ -36,7 +36,7 @@
 # (e.g. binary:accel) where test is run for any matching "spec" while actual
 # argument passed to test executable is "impl".
 # Otherwise "spec" is equivalent to "spec:spec" pair.
-# (e.g. "binary" is equivalent to "binary:bianry" in tests.json)
+# (e.g. "binary" is equivalent to "binary:binary" in tests.json)
 #
 VALID_JSON_KEYS = [
   'name',  # name of the library, typically a language name