Refactor for release; still need integration tests
diff --git a/src/test/java/com/intel/jndn/management/ControlResponseTest.java b/src/test/java/com/intel/jndn/management/ControlResponseTest.java
new file mode 100644
index 0000000..5d026e0
--- /dev/null
+++ b/src/test/java/com/intel/jndn/management/ControlResponseTest.java
@@ -0,0 +1,52 @@
+/*
+ * File name: ControlResponseTest.java
+ * 
+ * Purpose: Test encoding/decoding of ControlResponses.
+ * 
+ * © Copyright Intel Corporation. All rights reserved.
+ * Intel Corporation, 2200 Mission College Boulevard,
+ * Santa Clara, CA 95052-8119, USA
+ */
+package com.intel.jndn.management;
+
+import com.intel.jndn.management.types.ControlResponse;
+import junit.framework.Assert;
+import net.named_data.jndn.ControlParameters;
+import net.named_data.jndn.util.Blob;
+import org.junit.Test;
+
+/**
+ * Test encoding/decoding of ControlResponses.
+ *
+ * @author Andrew Brown <andrew.brown@intel.com>
+ */
+public class ControlResponseTest {
+
+	/**
+	 * Test encoding/decoding
+	 *
+	 * @throws java.lang.Exception
+	 */
+	@Test
+	public void testEncodeDecode() throws Exception {
+		ControlParameters parameters = new ControlParameters();
+		parameters.setFaceId(3);
+		ControlResponse response = new ControlResponse();
+		response.setStatusCode(404);
+		response.setStatusText("Not Found");
+		response.getBody().add(parameters);
+
+		// encode
+		Blob encoded = response.wireEncode();
+
+		// decode
+		ControlResponse decoded = new ControlResponse();
+		decoded.wireDecode(encoded.buf());
+
+		// test
+		Assert.assertEquals(response.getStatusCode(), decoded.getStatusCode());
+		Assert.assertEquals(response.getStatusText(), decoded.getStatusText());
+		Assert.assertEquals(response.getBody().size(), decoded.getBody().size());
+		Assert.assertEquals(response.getBody().get(0).getFaceId(), decoded.getBody().get(0).getFaceId());
+	}
+}