diff --git a/src/test/java/com/intel/jndn/mock/MockFaceTest.java b/src/test/java/com/intel/jndn/mock/MockFaceTest.java
index 144a05e..9682f95 100644
--- a/src/test/java/com/intel/jndn/mock/MockFaceTest.java
+++ b/src/test/java/com/intel/jndn/mock/MockFaceTest.java
@@ -29,6 +29,7 @@
  * Test MockFace functionality
  */
 public class MockFaceTest {
+
   @Before
   public void setup() throws SecurityException {
     face = new MockFace();
@@ -38,10 +39,8 @@
     exception = null;
   }
 
-  /////////////////////////////////////////////////////////////////////////////
-
   @Test
-  public void ExpressInterest() throws IOException, EncodingException, InterruptedException {
+  public void testExpressingAnInterest() throws IOException, EncodingException, InterruptedException {
     // make request
     expressInterest("/test/with/responses");
 
@@ -54,14 +53,14 @@
 
     run(20);
 
-    assertNotEquals(recvData, null);
+    assertNotNull(recvData);
     assertEquals(isTimeout, false);
     assertEquals(recvData.getName().toString(), "/test/with/responses");
     assertEquals(recvData.getContent().buf(), new Blob("...").buf());
   }
 
   @Test
-  public void ExpressInterest2() throws IOException, EncodingException, InterruptedException {
+  public void testExpressingAnInterestAfterConfiguration() throws IOException, EncodingException, InterruptedException {
     // add response (before face is connected)
     Data response = new Data(new Name("/test/with/responses"));
     response.setContent(new Blob("..."));
@@ -72,14 +71,14 @@
 
     run(20);
 
-    assertNotEquals(recvData, null);
+    assertNotNull(recvData);
     assertEquals(isTimeout, false);
     assertEquals(recvData.getName().toString(), "/test/with/responses");
     assertEquals(recvData.getContent().buf(), new Blob("...").buf());
   }
 
   @Test
-  public void ExpressInterestTimeout() throws IOException, EncodingException, InterruptedException {
+  public void testInterestTimeouts() throws IOException, EncodingException, InterruptedException {
     // make request
     expressInterest("/some/name");
 
@@ -90,7 +89,7 @@
   }
 
   @Test
-  public void RegisterPrefix() throws IOException, SecurityException, EncodingException, InterruptedException {
+  public void testPrefixRegistration() throws IOException, SecurityException, EncodingException, InterruptedException {
     class State {
       boolean regFailed = false;
       boolean regSucceed = false;
@@ -98,38 +97,34 @@
     final State state = new State();
 
     logger.info("Register prefix: /test/with/handlers");
-    face.registerPrefix(new Name("/test/with/handlers"),
-      new OnInterestCallback() {
-        @Override
-        public void onInterest(Name prefix, Interest interest, Face face, long interestFilterId, InterestFilter filter) {
-          logger.info("Received interest, responding: " + interest.getName().toUri());
-          Data response = new Data(new Name("/test/with/handlers"));
-          response.setContent(new Blob("..."));
-          try {
-            face.putData(response);
-          } catch (IOException e) {
-            exception = e;
-          }
-          counter++;
+    face.registerPrefix(new Name("/test/with/handlers"), new OnInterestCallback() {
+      @Override
+      public void onInterest(Name prefix, Interest interest, Face face, long interestFilterId, InterestFilter filter) {
+        logger.info("Received interest, responding: " + interest.getName().toUri());
+        Data response = new Data(new Name("/test/with/handlers"));
+        response.setContent(new Blob("..."));
+        try {
+          face.putData(response);
+        } catch (IOException e) {
+          exception = e;
         }
-      },
-      new OnRegisterFailed() {
-        @Override
-        public void onRegisterFailed(Name prefix) {
-          logger.info("Prefix registration fails: " + prefix);
-          state.regFailed = true;
-          counter++;
-        }
-      },
-      new OnRegisterSuccess() {
-        @Override
-        public void onRegisterSuccess(Name prefix, long registeredPrefixId) {
-          logger.info("Prefix registration succeed: " + prefix);
-          state.regSucceed = true;
-          counter++;
-        }
+        counter++;
       }
-    );
+    }, new OnRegisterFailed() {
+      @Override
+      public void onRegisterFailed(Name prefix) {
+        logger.info("Prefix registration fails: " + prefix);
+        state.regFailed = true;
+        counter++;
+      }
+    }, new OnRegisterSuccess() {
+      @Override
+      public void onRegisterSuccess(Name prefix, long registeredPrefixId) {
+        logger.info("Prefix registration succeed: " + prefix);
+        state.regSucceed = true;
+        counter++;
+      }
+    });
 
     run(100, 1);
     assertTrue(state.regSucceed);
@@ -149,15 +144,15 @@
   }
 
   @Test
-  public void RegistrationPrefixConnectTransport() throws IOException, SecurityException {
+  public void testThatTransportConnectsOnPrefixRegistration() throws IOException, SecurityException {
     assertFalse(face.getTransport().getIsConnected());
     face.registerPrefix(new Name("/fake/prefix"), (OnInterestCallback) null, (OnRegisterFailed) null,
-      (OnRegisterSuccess) null);
+            (OnRegisterSuccess) null);
     assertTrue(face.getTransport().getIsConnected());
   }
 
   @Test
-  public void SetInterestFilter() throws IOException, SecurityException, EncodingException, InterruptedException {
+  public void testInterestFilters() throws IOException, SecurityException, EncodingException, InterruptedException {
     class State {
       boolean regFailed = false;
       boolean regSucceed = false;
@@ -214,26 +209,23 @@
     run(limit, 1);
   }
 
-  private void
-  expressInterest(String name) throws IOException {
+  private void expressInterest(String name) throws IOException {
     logger.info("Express interest: " + name);
-    face.expressInterest(new Interest(new Name(name)).setInterestLifetimeMilliseconds(1000), new
-        OnData() {
-          @Override
-          public void onData(Interest interest, Data data) {
-            counter++;
-            logger.fine("Received data");
-            recvData = data;
-          }
-        },
-      new OnTimeout() {
-        @Override
-        public void onTimeout(Interest interest) {
-          logger.fine("Received timeout");
-          counter++;
-          isTimeout = true;
-        }
-      });
+    face.expressInterest(new Interest(new Name(name)).setInterestLifetimeMilliseconds(1000), new OnData() {
+      @Override
+      public void onData(Interest interest, Data data) {
+        counter++;
+        logger.fine("Received data");
+        recvData = data;
+      }
+    }, new OnTimeout() {
+      @Override
+      public void onTimeout(Interest interest) {
+        logger.fine("Received timeout");
+        counter++;
+        isTimeout = true;
+      }
+    });
   }
 
   /////////////////////////////////////////////////////////////////////////////
diff --git a/src/test/java/com/intel/jndn/mock/MockKeyChainTest.java b/src/test/java/com/intel/jndn/mock/MockKeyChainTest.java
index 137d1b4..a599ae9 100644
--- a/src/test/java/com/intel/jndn/mock/MockKeyChainTest.java
+++ b/src/test/java/com/intel/jndn/mock/MockKeyChainTest.java
@@ -20,6 +20,7 @@
 
 /**
  * Test MockKeyChain
+ *
  * @author Andrew Brown <andrew.brown@intel.com>
  */
 public class MockKeyChainTest {