diff --git a/pom.xml b/pom.xml
index e0d6da0..bc69d87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.intel.jndn.management</groupId>
   <artifactId>jndn-management</artifactId>
-  <version>0.9.5</version>
+  <version>0.9.6</version>
   <name>jndn-management</name>
   <description>Tools for managing an NDN forwarding daemon</description>
   <url>https://github.com/01org/jndn-management</url>
diff --git a/src/main/java/com/intel/jndn/management/ManagementException.java b/src/main/java/com/intel/jndn/management/ManagementException.java
new file mode 100644
index 0000000..70a15d1
--- /dev/null
+++ b/src/main/java/com/intel/jndn/management/ManagementException.java
@@ -0,0 +1,73 @@
+/*
+ * jndn-management
+ * Copyright (c) 2015, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 3, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ */
+package com.intel.jndn.management;
+
+import com.intel.jndn.management.types.ControlResponse;
+import net.named_data.jndn.encoding.EncodingException;
+import net.named_data.jndn.util.Blob;
+
+/**
+ * Represent a failure to correctly manage the NDN Forwarding Daemon (NFD).
+ * Inspect this object with getCause() to see why the management operation
+ * failed.
+ *
+ * @author Andrew Brown <andrew.brown@intel.com>
+ */
+public class ManagementException extends Exception {
+
+  /**
+   *
+   * @param message
+   */
+  public ManagementException(String message) {
+    super(message);
+  }
+
+  /**
+   *
+   * @param message
+   * @param cause
+   */
+  public ManagementException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  /**
+   * Parse an NFD response to create a ManagementException.
+   *
+   * @param forwarderResponse
+   * @return
+   */
+  public static ManagementException fromResponse(Blob forwarderResponse) {
+    ControlResponse response = new ControlResponse();
+    try {
+      response.wireDecode(forwarderResponse.buf());
+      String message = "Action failed, forwarder returned: " + response.getStatusCode() + " " + response.getStatusText();
+      return new ManagementException(message);
+    } catch (EncodingException e) {
+      return new ManagementException("Action failed and forwarder response was unparseable.", e);
+    }
+  }
+
+  /**
+   * Parse an NFD response to create a ManagementException.
+   *
+   * @param forwarderResponse
+   * @return
+   */
+  public static ManagementException fromResponse(ControlResponse response) {
+    String message = "Action failed, forwarder returned: " + response.getStatusCode() + " " + response.getStatusText();
+    return new ManagementException(message);
+  }
+}
diff --git a/src/main/java/com/intel/jndn/management/NFD.java b/src/main/java/com/intel/jndn/management/NFD.java
index 2578713..c0910b5 100644
--- a/src/main/java/com/intel/jndn/management/NFD.java
+++ b/src/main/java/com/intel/jndn/management/NFD.java
@@ -19,7 +19,7 @@
 import com.intel.jndn.management.types.FibEntry;
 import com.intel.jndn.management.types.LocalControlHeader;
 import com.intel.jndn.management.types.RibEntry;
-import com.intel.jndn.utils.Client;
+import com.intel.jndn.utils.SimpleClient;
 import com.intel.jndn.utils.SegmentedClient;
 import java.io.IOException;
 import java.util.List;
@@ -43,6 +43,7 @@
 public class NFD {
 
   public final static long DEFAULT_TIMEOUT = 2000;
+  public final static int OK_STATUS = 200;
   static private final Logger logger = Logger.getLogger(NFD.class.getName());
 
   /**
@@ -74,8 +75,12 @@
     interest.setMustBeFresh(true);
 
     // send packet
-    Data data = Client.getDefault().getSync(face, interest);
-    return data != null;
+    try {
+      Data data = SimpleClient.getDefault().getSync(face, interest);
+      return data != null;
+    } catch (IOException e) {
+      return false;
+    }
   }
 
   /**
@@ -85,29 +90,10 @@
    *
    * @param forwarder Only a localhost Face
    * @return
-   * @throws Exception
+   * @throws java.lang.Exception
    */
   public static List<FaceStatus> getFaceList(Face forwarder) throws Exception {
-    // build management Interest packet; see http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
-    Interest interest = new Interest(new Name("/localhost/nfd/faces/list"));
-    interest.setMustBeFresh(true);
-    interest.setChildSelector(Interest.CHILD_SELECTOR_RIGHT);
-    interest.setInterestLifetimeMilliseconds(DEFAULT_TIMEOUT);
-
-    // send packet
-    Data data = SegmentedClient.getDefault().getSync(forwarder, interest);
-    if (data == null) {
-      throw new Exception("Failed to retrieve list of faces from the forwarder.");
-    }
-
-    // check for failed request
-    if (data.getContent().buf().get(0) == ControlResponse.TLV_CONTROL_RESPONSE) {
-      ControlResponse response = new ControlResponse();
-      response.wireDecode(data.getContent().buf());
-      throw new Exception("Failed to retrieve list of faces, forwarder returned: " + response.getStatusCode() + " " + response.getStatusText());
-    }
-
-    // parse packet
+    Data data = retrieveDataSet(forwarder, new Name("/localhost/nfd/faces/list"));
     return StatusDataset.wireDecode(data.getContent(), FaceStatus.class);
   }
 
@@ -118,66 +104,24 @@
    *
    * @param forwarder Only a localhost Face
    * @return
-   * @throws Exception
+   * @throws java.lang.Exception
    */
   public static List<FibEntry> getFibList(Face forwarder) throws Exception {
-    // build management Interest packet; see http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
-    Interest interest = new Interest(new Name("/localhost/nfd/fib/list"));
-    interest.setMustBeFresh(true);
-    interest.setChildSelector(Interest.CHILD_SELECTOR_RIGHT);
-    interest.setInterestLifetimeMilliseconds(DEFAULT_TIMEOUT);
-
-    // TODO verify that all faces are being returned; right now they don't
-    // match up with the results from nfd-status-http-server but no 
-    // additional segments are present;  
-    // see http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
-    // send packet
-    Data data = SegmentedClient.getDefault().getSync(forwarder, interest);
-    if (data == null) {
-      throw new Exception("Failed to retrieve list of FIB entries from the forwarder.");
-    }
-
-    // check for failed request
-    if (data.getContent().buf().get(0) == ControlResponse.TLV_CONTROL_RESPONSE) {
-      ControlResponse response = new ControlResponse();
-      response.wireDecode(data.getContent().buf());
-      throw new Exception("Failed to retrieve list of FIB entries, forwarder returned: " + response.getStatusCode() + " " + response.getStatusText());
-    }
-
-    // parse packet
+    Data data = retrieveDataSet(forwarder, new Name("/localhost/nfd/fib/list"));
     return StatusDataset.wireDecode(data.getContent(), FibEntry.class);
   }
 
   /**
    * Retrieve a list of routing entries from the RIB; calls
    * /localhost/nfd/rib/list which requires a local Face (all non-local packets
-   * are dropped)
+   * are dropped).
    *
    * @param forwarder Only a localhost Face
    * @return
-   * @throws Exception
+   * @throws java.lang.Exception
    */
   public static List<RibEntry> getRouteList(Face forwarder) throws Exception {
-    // build management Interest packet; see http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
-    Interest interest = new Interest(new Name("/localhost/nfd/rib/list"));
-    interest.setMustBeFresh(true);
-    interest.setChildSelector(Interest.CHILD_SELECTOR_RIGHT);
-    interest.setInterestLifetimeMilliseconds(DEFAULT_TIMEOUT);
-
-    // send packet
-    Data data = SegmentedClient.getDefault().getSync(forwarder, interest);
-    if (data == null) {
-      throw new Exception("Failed to retrieve list of routes from the forwarder.");
-    }
-
-    // check for failed request
-    if (data.getContent().buf().get(0) == ControlResponse.TLV_CONTROL_RESPONSE) {
-      ControlResponse response = new ControlResponse();
-      response.wireDecode(data.getContent().buf());
-      throw new Exception("Failed to retrieve list of routes, forwarder returned: " + response.getStatusCode() + " " + response.getStatusText());
-    }
-
-    // parse packet
+    Data data = retrieveDataSet(forwarder, new Name("/localhost/nfd/rib/list"));
     return StatusDataset.wireDecode(data.getContent(), RibEntry.class);
   }
 
@@ -189,10 +133,9 @@
    * @param forwarder Only a localhost Face
    * @param faceId
    * @param prefix
-   * @return
-   * @throws Exception
+   * @throws java.lang.Exception
    */
-  public static boolean addNextHop(Face forwarder, int faceId, Name prefix) throws Exception {
+  public static void addNextHop(Face forwarder, int faceId, Name prefix) throws Exception {
     // build command name
     Name command = new Name("/localhost/nfd/fib/add-nexthop");
     ControlParameters parameters = new ControlParameters();
@@ -201,7 +144,7 @@
     command.append(parameters.wireEncode());
 
     // send the interest
-    return sendCommandAndErrorCheck(forwarder, new Interest(command));
+    sendCommand(forwarder, new Interest(command));
   }
 
   /**
@@ -223,40 +166,27 @@
     // send the interest
     ControlResponse response = sendCommand(forwarder, new Interest(command));
 
-    // check for body and that status code is OK (TODO: 200 should be replaced with a CONSTANT like ControlResponse.STATUS_OK)
-    if (response.getBody().isEmpty() || response.getStatusCode() != 200) {
-      throw new Exception("Failed to create face: " + uri + " " + response.getStatusText());
-    }
-
     // return
     return response.getBody().get(0).getFaceId();
   }
 
   /**
-   * Destroy a face on given forwarder. Ensure the forwarding face is on
-   * the local machine (management requests are to /localhost/...) and that
-   * command signing has been set up (e.g. forwarder.setCommandSigningInfo()).
+   * Destroy a face on given forwarder. Ensure the forwarding face is on the
+   * local machine (management requests are to /localhost/...) and that command
+   * signing has been set up (e.g. forwarder.setCommandSigningInfo()).
    *
    * @param forwarder Only a localhost Face
    * @param faceId
-   * @return 
    * @throws java.lang.Exception
    */
-  public static boolean destroyFace(Face forwarder, int faceId) throws Exception {
+  public static void destroyFace(Face forwarder, int faceId) throws Exception {
     Name command = new Name("/localhost/nfd/faces/destroy");
     ControlParameters parameters = new ControlParameters();
     parameters.setFaceId(faceId);
     command.append(parameters.wireEncode());
 
     // send the interest
-    ControlResponse response = sendCommand(forwarder, new Interest(command));
-
-    // check for body and that status code is OK (TODO: 200 should be replaced with a CONSTANT like ControlResponse.STATUS_OK)
-    if (response.getBody().isEmpty() || response.getStatusCode() != 200) {
-      throw new Exception("Failed to destroy face: " + String.valueOf(faceId) + " " + response.getStatusText());
-    }
-
-    return true;
+    sendCommand(forwarder, new Interest(command));
   }
 
   /**
@@ -265,10 +195,9 @@
    *
    * @param forwarder
    * @param header
-   * @return
    * @throws Exception
    */
-  public static boolean enableLocalControlHeader(Face forwarder, LocalControlHeader header) throws Exception {
+  public static void enableLocalControlHeader(Face forwarder, LocalControlHeader header) throws Exception {
     // build command name
     Name command = new Name("/localhost/nfd/faces/enable-local-control");
     ControlParameters parameters = new ControlParameters();
@@ -276,7 +205,7 @@
     command.append(parameters.wireEncode());
 
     // send command and return
-    return sendCommandAndErrorCheck(forwarder, new Interest(command));
+    sendCommand(forwarder, new Interest(command));
   }
 
   /**
@@ -285,10 +214,9 @@
    *
    * @param forwarder
    * @param header
-   * @return
    * @throws Exception
    */
-  public static boolean disableLocalControlHeader(Face forwarder, LocalControlHeader header) throws Exception {
+  public static void disableLocalControlHeader(Face forwarder, LocalControlHeader header) throws Exception {
     // build command name
     Name command = new Name("/localhost/nfd/faces/disable-local-control");
     ControlParameters parameters = new ControlParameters();
@@ -296,7 +224,7 @@
     command.append(parameters.wireEncode());
 
     // send command and return
-    return sendCommandAndErrorCheck(forwarder, new Interest(command));
+    sendCommand(forwarder, new Interest(command));
   }
 
   /**
@@ -309,16 +237,15 @@
    *
    * @param forwarder Only a localhost Face
    * @param controlParameters
-   * @return
    * @throws Exception
    */
-  public static boolean register(Face forwarder, ControlParameters controlParameters) throws Exception {
+  public static void register(Face forwarder, ControlParameters controlParameters) throws Exception {
     // build command name
     Name command = new Name("/localhost/nfd/rib/register");
     command.append(controlParameters.wireEncode());
 
     // send the interest
-    return sendCommandAndErrorCheck(forwarder, new Interest(command));
+    sendCommand(forwarder, new Interest(command));
   }
 
   /**
@@ -330,15 +257,14 @@
    * @param uri
    * @param cost
    * @param route
-   * @return true for successful registration
    * @throws java.lang.Exception
    */
-  public static boolean register(Face forwarder, String uri, Name route, int cost) throws Exception {
+  public static void register(Face forwarder, String uri, Name route, int cost) throws Exception {
     // create the new face
     int faceId = createFace(forwarder, uri);
 
     // run base method
-    return register(forwarder, faceId, route, cost);
+    register(forwarder, faceId, route, cost);
   }
 
   /**
@@ -350,10 +276,9 @@
    * @param faceId
    * @param route
    * @param cost
-   * @return true for successful registration
    * @throws java.lang.Exception
    */
-  public static boolean register(Face forwarder, int faceId, Name route, int cost) throws Exception {
+  public static void register(Face forwarder, int faceId, Name route, int cost) throws Exception {
     // build command name
     ControlParameters parameters = new ControlParameters();
     parameters.setName(route);
@@ -365,7 +290,7 @@
     parameters.setForwardingFlags(flags);
 
     // run base method
-    return register(forwarder, parameters);
+    register(forwarder, parameters);
   }
 
   /**
@@ -378,15 +303,15 @@
    *
    * @param forwarder
    * @param controlParameters
-   * @return
+   * @throws java.lang.Exception
    */
-  public static boolean unregister(Face forwarder, ControlParameters controlParameters) throws Exception {
+  public static void unregister(Face forwarder, ControlParameters controlParameters) throws Exception {
     // build command name
     Name command = new Name("/localhost/nfd/rib/unregister");
     command.append(controlParameters.wireEncode());
 
     // send the interest
-    return sendCommandAndErrorCheck(forwarder, new Interest(command));
+    sendCommand(forwarder, new Interest(command));
   }
 
   /**
@@ -399,15 +324,15 @@
    *
    * @param forwarder
    * @param route
-   * @return
+   * @throws java.lang.Exception
    */
-  public static boolean unregister(Face forwarder, Name route) throws Exception {
+  public static void unregister(Face forwarder, Name route) throws Exception {
     // build command name
     ControlParameters controlParameters = new ControlParameters();
     controlParameters.setName(route);
 
     // send the interest
-    return unregister(forwarder, controlParameters);
+    unregister(forwarder, controlParameters);
   }
 
   /**
@@ -421,16 +346,16 @@
    * @param forwarder
    * @param route
    * @param faceId
-   * @return
+   * @throws java.lang.Exception
    */
-  public static boolean unregister(Face forwarder, Name route, int faceId) throws Exception {
+  public static void unregister(Face forwarder, Name route, int faceId) throws Exception {
     // build command name
     ControlParameters controlParameters = new ControlParameters();
     controlParameters.setName(route);
     controlParameters.setFaceId(faceId);
 
     // send the interest
-    return unregister(forwarder, controlParameters);
+    unregister(forwarder, controlParameters);
   }
 
   /**
@@ -444,9 +369,9 @@
    * @param forwarder
    * @param route
    * @param uri
-   * @return
+   * @throws java.lang.Exception
    */
-  public static boolean unregister(Face forwarder, Name route, String uri) throws Exception {
+  public static void unregister(Face forwarder, Name route, String uri) throws Exception {
     int faceId = -1;
     for (FaceStatus face : getFaceList(forwarder)) {
       if (face.getUri().matches(uri)) {
@@ -456,11 +381,11 @@
     }
 
     if (faceId == -1) {
-      throw new Exception("Face not found: " + uri);
+      throw new ManagementException("Face not found: " + uri);
     }
 
     // send the interest
-    return unregister(forwarder, route, faceId);
+    unregister(forwarder, route, faceId);
   }
 
   /**
@@ -474,10 +399,9 @@
    * @param forwarder Only a localhost Face
    * @param prefix
    * @param strategy
-   * @return true for successful command
    * @throws Exception
    */
-  public static boolean setStrategy(Face forwarder, Name prefix, Name strategy) throws Exception {
+  public static void setStrategy(Face forwarder, Name prefix, Name strategy) throws Exception {
     // build command name
     Name command = new Name("/localhost/nfd/strategy-choice/set");
     ControlParameters parameters = new ControlParameters();
@@ -486,7 +410,36 @@
     command.append(parameters.wireEncode());
 
     // send the interest
-    return sendCommandAndErrorCheck(forwarder, new Interest(command));
+    sendCommand(forwarder, new Interest(command));
+  }
+
+  /**
+   * Build an interest to retrieve a segmented data set from the NFD; for
+   * details on the DataSet, see
+   * http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
+   *
+   * @param forwarder
+   * @param datasetName
+   * @return
+   * @throws IOException
+   * @throws ManagementException
+   */
+  public static Data retrieveDataSet(Face forwarder, Name datasetName) throws IOException, ManagementException {
+    // build management Interest packet; see http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
+    Interest interest = new Interest(datasetName);
+    interest.setMustBeFresh(true);
+    interest.setChildSelector(Interest.CHILD_SELECTOR_RIGHT);
+    interest.setInterestLifetimeMilliseconds(DEFAULT_TIMEOUT);
+
+    // send packet
+    Data data = SegmentedClient.getDefault().getSync(forwarder, interest);
+
+    // check for failed request
+    if (data.getContent().buf().get(0) == ControlResponse.TLV_CONTROL_RESPONSE) {
+      throw ManagementException.fromResponse(data.getContent());
+    }
+    
+    return data;
   }
 
   /**
@@ -496,53 +449,36 @@
    * (management requests are to /localhost/...) and that command signing has
    * been set up (e.g. forwarder.setCommandSigningInfo()).
    *
-   * @param forwarder Only a localhost Face
+   * @param forwarder Only a localhost Face, command signing info must be set
    * @param interest As described at
    * http://redmine.named-data.net/projects/nfd/wiki/ControlCommand, the
    * requested interest must have encoded ControlParameters appended to the
    * interest name
    * @return
-   * @throws net.named_data.jndn.security.SecurityException
    * @throws java.io.IOException
    * @throws net.named_data.jndn.encoding.EncodingException
+   * @throws com.intel.jndn.management.ManagementException
    */
-  public static ControlResponse sendCommand(Face forwarder, Interest interest) throws SecurityException, IOException, EncodingException {
-    forwarder.makeCommandInterest(interest);
+  public static ControlResponse sendCommand(Face forwarder, Interest interest) throws IOException, EncodingException, ManagementException {
+    // forwarder must have command signing info set
+    try {
+      forwarder.makeCommandInterest(interest);
+    } catch (SecurityException e) {
+      throw new IllegalArgumentException("Failed to make command interest; ensure command signing info is set on the face.", e);
+    }
 
     // send command packet
-    Data data = Client.getDefault().getSync(forwarder, interest);
-    if (data == null) {
-      throw new IOException("Failed to receive command response.");
-    }
+    Data data = SimpleClient.getDefault().getSync(forwarder, interest);
 
-    // return response
+    // decode response
     ControlResponse response = new ControlResponse();
     response.wireDecode(data.getContent().buf());
-    return response;
-  }
 
-  /**
-   * Send an interest as a command to the forwarder; this method will convert
-   * the interest to a command interest and block until a response is received
-   * from the forwarder.
-   *
-   * @param forwarder Only a localhost Face
-   * @param interest As described at
-   * http://redmine.named-data.net/projects/nfd/wiki/ControlCommand, the
-   * requested interest must have encoded ControlParameters appended to the
-   * interest name
-   * @return
-   * @throws net.named_data.jndn.security.SecurityException
-   * @throws java.io.IOException
-   * @throws net.named_data.jndn.encoding.EncodingException
-   */
-  public static boolean sendCommandAndErrorCheck(Face forwarder, Interest interest) throws SecurityException, IOException, EncodingException {
-    ControlResponse response = sendCommand(forwarder, interest);
-    if (response.getStatusCode() < 400) {
-      return true;
-    } else {
-      logger.warning("Command sent but failed: " + response.getStatusCode() + " " + response.getStatusText());
-      return false;
+    // check response for success
+    if (response.getStatusCode() != OK_STATUS) {
+      throw ManagementException.fromResponse(response);
     }
+
+    return response;
   }
 }
diff --git a/src/main/java/com/intel/jndn/management/types/StatusDataset.java b/src/main/java/com/intel/jndn/management/types/StatusDataset.java
index 17e4197..d5ef90c 100644
--- a/src/main/java/com/intel/jndn/management/types/StatusDataset.java
+++ b/src/main/java/com/intel/jndn/management/types/StatusDataset.java
@@ -13,6 +13,7 @@
  */
 package com.intel.jndn.management.types;
 
+import com.intel.jndn.management.ManagementException;
 import java.util.ArrayList;
 import java.util.List;
 import net.named_data.jndn.encoding.EncodingException;
@@ -35,18 +36,20 @@
    * @param statusDataset
    * @param type
    * @return
-   * @throws EncodingException
-   * @throws InstantiationException
-   * @throws IllegalAccessException
+   * @throws com.intel.jndn.management.ManagementException
    */
-  public static final <T extends Decodable> List<T> wireDecode(Blob statusDataset, Class<T> type) throws EncodingException, InstantiationException, IllegalAccessException {
+  public static final <T extends Decodable> List<T> wireDecode(Blob statusDataset, Class<T> type) throws ManagementException {
     List<T> entries = new ArrayList<>();
     int endOffset = statusDataset.size();
     TlvDecoder decoder = new TlvDecoder(statusDataset.buf());
     while (decoder.getOffset() < endOffset) {
-      T entry = type.newInstance();
-      entry.wireDecode(decoder);
-      entries.add(entry);
+      try {
+        T entry = type.newInstance();
+        entry.wireDecode(decoder);
+        entries.add(entry);
+      } catch (EncodingException | IllegalAccessException | InstantiationException e) {
+        throw new ManagementException("Failed to read status dataset.", e);
+      }
     }
     return entries;
   }
diff --git a/src/test/java/com/intel/jndn/management/FaceStatusTest.java b/src/test/java/com/intel/jndn/management/FaceStatusTest.java
index 2bf7ce6..5a587a6 100644
--- a/src/test/java/com/intel/jndn/management/FaceStatusTest.java
+++ b/src/test/java/com/intel/jndn/management/FaceStatusTest.java
@@ -15,7 +15,8 @@
 
 import com.intel.jndn.management.types.StatusDataset;
 import com.intel.jndn.management.types.FaceStatus;
-import com.intel.jndn.utils.Client;
+import com.intel.jndn.utils.SimpleClient;
+import java.io.IOException;
 import java.util.List;
 import java.util.logging.Logger;
 import junit.framework.Assert;
@@ -113,7 +114,7 @@
    * @param usePreComputedData to avoid errors when local NFD is not present
    * @return
    */
-  private static Data getFaceData(boolean usePreComputedData) {
+  private static Data getFaceData(boolean usePreComputedData) throws IOException {
     // use pre-computed data to avoid errors when local NFD is not present
     if (usePreComputedData) {
       Data data = new Data();
@@ -130,7 +131,7 @@
       interest.setInterestLifetimeMilliseconds(2000.0);
 
       // send packet
-      Data data = Client.getDefault().getSync(forwarder, interest);
+      Data data = SimpleClient.getDefault().getSync(forwarder, interest);
       String hex = data.getContent().toHex();
       logger.info("Hex dump of face list: " + hex);
       return data;
diff --git a/src/test/java/com/intel/jndn/management/FibEntryTest.java b/src/test/java/com/intel/jndn/management/FibEntryTest.java
index 026178f..1cd5897 100644
--- a/src/test/java/com/intel/jndn/management/FibEntryTest.java
+++ b/src/test/java/com/intel/jndn/management/FibEntryTest.java
@@ -16,7 +16,7 @@
 import com.intel.jndn.management.types.StatusDataset;
 import com.intel.jndn.management.types.NextHopRecord;
 import com.intel.jndn.management.types.FibEntry;
-import com.intel.jndn.utils.Client;
+import com.intel.jndn.utils.SimpleClient;
 import java.util.List;
 import junit.framework.Assert;
 import net.named_data.jndn.Data;
@@ -79,7 +79,7 @@
     interest.setInterestLifetimeMilliseconds(2000.0);
 
     // send packet
-    Data data = Client.getDefault().getSync(forwarder, interest);
+    Data data = SimpleClient.getDefault().getSync(forwarder, interest);
 
     // decode results
     List<FibEntry> results = StatusDataset.wireDecode(data.getContent(), FibEntry.class);
diff --git a/src/test/java/com/intel/jndn/management/IntegrationSuite.java b/src/test/java/com/intel/jndn/management/IntegrationSuite.java
index f0167b5..5f32711 100644
--- a/src/test/java/com/intel/jndn/management/IntegrationSuite.java
+++ b/src/test/java/com/intel/jndn/management/IntegrationSuite.java
@@ -13,6 +13,7 @@
  */
 package com.intel.jndn.management;
 
+import com.intel.jndn.management.types.RibEntry;
 import java.util.logging.Logger;
 import junit.framework.Assert;
 import net.named_data.jndn.Face;
@@ -48,10 +49,20 @@
     Assert.assertFalse(NFD.getRouteList(face).isEmpty());
 
     // create a new route
-    Assert.assertTrue(NFD.register(face, "udp4://127.0.0.1:56363", new Name("/my/test/route"), 999));
+    NFD.register(face, "udp4://127.0.0.1:56363", new Name("/my/test/route"), 999);
+    
+    // check that route is created
+    boolean found = false;
+    for(RibEntry route : NFD.getRouteList(face)){
+      logger.info("Found route: " + route.getName().toUri());
+      if(route.getName().equals(new Name("/my/test/route"))){
+        found = true;
+      }
+    }
+    Assert.assertTrue(found);
 
     // remove the route
-    Assert.assertTrue(NFD.unregister(face, new Name("/my/test/route"), "udp4://127.0.0.1:56363"));
+    NFD.unregister(face, new Name("/my/test/route"), "udp4://127.0.0.1:56363");
   }
 
   /**
diff --git a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
index 2034d13..7686616 100644
--- a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
+++ b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
@@ -14,8 +14,9 @@
 package com.intel.jndn.management;
 
 import com.intel.jndn.management.types.LocalControlHeader;
-import com.intel.jndn.utils.Client;
+import com.intel.jndn.utils.SimpleClient;
 import java.util.logging.Logger;
+import junit.framework.Assert;
 import net.named_data.jndn.Data;
 import net.named_data.jndn.Face;
 import net.named_data.jndn.Name;
@@ -45,12 +46,12 @@
     forwarder.setCommandSigningInfo(keyChain, keyChain.getDefaultCertificateName());
 
     // enable incoming face ID header
-    boolean success = NFD.enableLocalControlHeader(forwarder, LocalControlHeader.INCOMING_FACE_ID);
-    assertTrue(success);
+    NFD.enableLocalControlHeader(forwarder, LocalControlHeader.INCOMING_FACE_ID);
     
     // use and verify
-    Data data = Client.getDefault().getSync(forwarder, new Name("/localhost/nfd"));
+    Data data = SimpleClient.getDefault().getSync(forwarder, new Name("/localhost/nfd"));
     long faceId = data.getIncomingFaceId();
+    Assert.assertTrue(faceId != -1); // this verifies that the headers are working correctly
     logger.info("Face ID for this client on the forwarder: " + faceId);
   }
 }
diff --git a/src/test/java/com/intel/jndn/management/RibEntryTest.java b/src/test/java/com/intel/jndn/management/RibEntryTest.java
index ea54fbd..8a63abb 100644
--- a/src/test/java/com/intel/jndn/management/RibEntryTest.java
+++ b/src/test/java/com/intel/jndn/management/RibEntryTest.java
@@ -16,7 +16,7 @@
 import com.intel.jndn.management.types.StatusDataset;
 import com.intel.jndn.management.types.RibEntry;
 import com.intel.jndn.management.types.Route;
-import com.intel.jndn.utils.Client;
+import com.intel.jndn.utils.SimpleClient;
 import java.util.List;
 import junit.framework.Assert;
 import net.named_data.jndn.Data;
@@ -81,7 +81,7 @@
     interest.setInterestLifetimeMilliseconds(2000.0);
 
     // send packet
-    Data data = Client.getDefault().getSync(forwarder, interest);
+    Data data = SimpleClient.getDefault().getSync(forwarder, interest);
 
     // decode results
     List<RibEntry> results = StatusDataset.wireDecode(data.getContent(), RibEntry.class);