Added documentation to all the proxy/rpc/enum unit test classes.

71 files changed, 1471 insertions, 384 deletions

diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
index 66c1e887a..859eafba0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
@@ -8,9 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.AmbientLightStatus}
+ */
 public class AmbientLightStatusTests extends TestCase {
 
-	// Verifies that the enum values are not null upon valid assignment.
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		
 		String example = "DAY";
@@ -40,7 +46,9 @@ public class AmbientLightStatusTests extends TestCase {
 		assertNotNull("TWILIGHT_4 returned null", enumTwilight4);		
 	}	
 	
-	// Verifies that an invalid assignment is null.
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "niGHt";
 		try {
@@ -52,7 +60,9 @@ public class AmbientLightStatusTests extends TestCase {
 		}
 	}
 	
-	// Verifies that a null assignment is invalid.
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -64,7 +74,9 @@ public class AmbientLightStatusTests extends TestCase {
 		}
 	}
 	
-	// Verifies the possible enum values of AmbientLightStatus.
+	/**
+	 * Verifies the possible enum values of AmbientLightStatus.
+	 */
 	public void testListEnum() {
  		List<AmbientLightStatus> enumValueList = Arrays.asList(AmbientLightStatus.values()); 		
 		List<AmbientLightStatus> enumTestList = new ArrayList<AmbientLightStatus>();
@@ -82,4 +94,4 @@ public class AmbientLightStatusTests extends TestCase {
 					enumValueList.containsAll(enumTestList) && 
 					enumTestList.containsAll(enumValueList));
 	}
-}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
index c3771276f..76d203901 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.AppHmiType}
+ */
 public class AppHmiTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "DEFAULT";
 		AppHMIType enumDefault = AppHMIType.valueForString(example);
@@ -44,6 +51,9 @@ public class AppHmiTypeTests extends TestCase {
 		assertNotNull("SYSTEM returned null", enumSystem);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "deFaUlt";
 		try {
@@ -55,6 +65,9 @@ public class AppHmiTypeTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -66,6 +79,9 @@ public class AppHmiTypeTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of AmbientLightStatus.
+	 */
 	public void testListEnum() {
  		List<AppHMIType> enumValueList = Arrays.asList(AppHMIType.values());
  		
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
index 001664547..23f2c0cc0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.AppInterfaceUnregisteredReason;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.AppInterfaceUregisteredReason}
+ */
 public class AppInterfaceUnregisteredReasonTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "USER_EXIT";
 		AppInterfaceUnregisteredReason enumUserExit = AppInterfaceUnregisteredReason.valueForString(example);
@@ -47,6 +54,9 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "uSer_ExiT";
 		try {
@@ -57,7 +67,10 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -68,7 +81,10 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of AppInterfaceUnregisteredReason.
+	 */
 	public void testListEnum() {
  		List<AppInterfaceUnregisteredReason> enumValueList = Arrays.asList(AppInterfaceUnregisteredReason.values());
 
@@ -88,4 +104,4 @@ public class AppInterfaceUnregisteredReasonTests extends TestCase {
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
 	}
-}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
index c27f1ead4..ab5972218 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.AudioStreamingState;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.AudioStreaming}
+ */
 public class AudioStreamingStateTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "AUDIBLE";
 		AudioStreamingState enumAudible = AudioStreamingState.valueForString(example);
@@ -23,7 +30,10 @@ public class AudioStreamingStateTests extends TestCase {
 		assertNotNull("ATTENUATED returned null", enumAttentuated);
 		assertNotNull("NOT_AUDIBLE returned null", enumNotAudible);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "aUDibLE";
 		try {
@@ -34,7 +44,10 @@ public class AudioStreamingStateTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -45,7 +58,10 @@ public class AudioStreamingStateTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of AudioStreamingState.
+	 */
 	public void testListEnum() {
  		List<AudioStreamingState> enumValueList = Arrays.asList(AudioStreamingState.values());
 
@@ -56,6 +72,5 @@ public class AudioStreamingStateTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
index e653d7015..6cbecf09a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
@@ -8,15 +8,25 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.AudioType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.AudioType}
+ */
 public class AudioTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "PCM";
 		AudioType enumPcm = AudioType.valueForString(example);
 		
 		assertNotNull("PCM returned null", enumPcm);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "pCM";
 		try {
@@ -27,7 +37,10 @@ public class AudioTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -39,6 +52,10 @@ public class AudioTypeTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of AudioType.
+	 */
 	public void testListEnum() {
  		List<AudioType> enumValueList = Arrays.asList(AudioType.values());
 
@@ -47,6 +64,5 @@ public class AudioTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
index 55951510d..65b4766e8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.BitsPerSample}
+ */
 public class BitsPerSampleTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "8_BIT";
 		BitsPerSample enum8Bit = BitsPerSample.valueForString(example);
@@ -20,6 +27,9 @@ public class BitsPerSampleTests extends TestCase {
 		assertNotNull("16_BIT returned null", enum16Bit);
 	}
 
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "8_biT";
 		try {
@@ -30,7 +40,10 @@ public class BitsPerSampleTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -41,7 +54,10 @@ public class BitsPerSampleTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies the possible enum values of BitsPerSample.
+	 */
 	public void testListEnum() {
  		List<BitsPerSample> enumValueList = Arrays.asList(BitsPerSample.values());
 
@@ -51,6 +67,5 @@ public class BitsPerSampleTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
index f68447073..4145844ee 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ButtonEventMode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ButtonEventMode}
+ */
 public class ButtonEventModeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "BUTTONUP";
 		ButtonEventMode enumButtonUp = ButtonEventMode.valueForString(example);
@@ -19,7 +26,10 @@ public class ButtonEventModeTests extends TestCase {
 		assertNotNull("BUTTONUP returned null", enumButtonUp);
 		assertNotNull("BUTTONDOWN returned null", enumButtonDown);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "buTTonUp";
 		try {
@@ -30,7 +40,10 @@ public class ButtonEventModeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -41,7 +54,10 @@ public class ButtonEventModeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of ButtonEventMode.
+	 */
 	public void testListEnum() {
  		List<ButtonEventMode> enumValueList = Arrays.asList(ButtonEventMode.values());
 
@@ -51,6 +67,5 @@ public class ButtonEventModeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
index 3e955e49e..1db7c4580 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ButtonName}
+ */
 public class ButtonNameTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "OK";
 		ButtonName enumOk = ButtonName.valueForString(example);
@@ -65,7 +72,10 @@ public class ButtonNameTests extends TestCase {
 		assertNotNull("CUSTOM_BUTTON returned null", enumCustomButton);
 		assertNotNull("SEARCH returned null", enumSearch);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "oK";
 		try {
@@ -76,7 +86,10 @@ public class ButtonNameTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -87,7 +100,10 @@ public class ButtonNameTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of ButtonName.
+	 */
 	public void testListEnum() {
  		List<ButtonName> enumValueList = Arrays.asList(ButtonName.values());
 
@@ -115,6 +131,10 @@ public class ButtonNameTests extends TestCase {
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
 	}
 	
+
+	/**
+	 * Tests the preset numeric order.
+	 */
 	public void testPresetIndeces () {
 		ButtonName[] inputPresetArray = new ButtonName[] {
 				ButtonName.PRESET_0, ButtonName.PRESET_1, ButtonName.PRESET_2, ButtonName.PRESET_3, ButtonName.PRESET_4, 
@@ -131,7 +151,10 @@ public class ButtonNameTests extends TestCase {
 			assertSame("Enum input " + result + " does not match expected value " + expect, result, expect);
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null preset lookup is invalid.
+	 */
 	public void testPresetNull () {
 		try {
 			assertNull("Passing null as a parameter does not return null", ButtonName.indexForPresetButton(null));
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
index 7fc3475e2..cbfe16a73 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ButtonPressMode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ButtonPressMode}
+ */
 public class ButtonPressModeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "LONG";
 		ButtonPressMode enumLong = ButtonPressMode.valueForString(example);
@@ -20,6 +27,9 @@ public class ButtonPressModeTests extends TestCase {
 		assertNotNull("SHORT returned null", enumShort);
 	}
 
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "lONg";
 		try {
@@ -30,7 +40,10 @@ public class ButtonPressModeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -41,7 +54,10 @@ public class ButtonPressModeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of ButtonPressMode.
+	 */
 	public void testListEnum() {
  		List<ButtonPressMode> enumValueList = Arrays.asList(ButtonPressMode.values());
 
@@ -51,6 +67,5 @@ public class ButtonPressModeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
index 57caa94e4..d66760d9a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.CarModeStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.CarModeStatus}
+ */
 public class CarModeStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NORMAL";
 		CarModeStatus enumNormal = CarModeStatus.valueForString(example);
@@ -25,7 +32,10 @@ public class CarModeStatusTests extends TestCase {
 		assertNotNull("TRANSPORT returned null", enumTransport);
 		assertNotNull("CRASH returned null", enumCrash);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "noRmaL";
 		try {
@@ -36,7 +46,10 @@ public class CarModeStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class CarModeStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of CarModeStatus.
+	 */
 	public void testListEnum() {
  		List<CarModeStatus> enumValueList = Arrays.asList(CarModeStatus.values());
 
@@ -59,6 +75,5 @@ public class CarModeStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
index 569e4192f..99bc37265 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.CharacterSet;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.CharacterSet}
+ */
 public class CharacterSetTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "TYPE2SET";
 		CharacterSet enumType2Set = CharacterSet.valueForString(example);
@@ -25,7 +32,10 @@ public class CharacterSetTests extends TestCase {
 		assertNotNull("CID1SET returned null", enumCid1Set);
 		assertNotNull("CID2SET returned null", enumCid2Set);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "tyPe2SeT";
 		try {
@@ -36,7 +46,10 @@ public class CharacterSetTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class CharacterSetTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of CharacterSet.
+	 */
 	public void testListEnum() {
  		List<CharacterSet> enumValueList = Arrays.asList(CharacterSet.values());
 
@@ -59,6 +75,5 @@ public class CharacterSetTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
index 6f5cf9e09..7eb7d31a0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.CompassDirection;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.CompassDirection}
+ */
 public class CompassDirectionTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NORTH";
 		CompassDirection enumNorth = CompassDirection.valueForString(example);
@@ -37,7 +44,10 @@ public class CompassDirectionTests extends TestCase {
 		assertNotNull("EAST returned null", enumEast);
 		assertNotNull("NORTHEAST returned null", enumNorthEast);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "noRTh";
 		try {
@@ -48,7 +58,10 @@ public class CompassDirectionTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -59,7 +72,10 @@ public class CompassDirectionTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of CompassDirection.
+	 */
 	public void testListEnum() {
  		List<CompassDirection> enumValueList = Arrays.asList(CompassDirection.values());
 
@@ -75,6 +91,5 @@ public class CompassDirectionTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
index a35beaca7..20946252c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ComponentVolumeStatus}
+ */
 public class ComponentVolumeStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "UNKNOWN";
 		ComponentVolumeStatus enumUnknown = ComponentVolumeStatus.valueForString(example);
@@ -30,9 +37,11 @@ public class ComponentVolumeStatusTests extends TestCase {
 		assertNotNull("FAULT returned null", enumFault);
 		assertNotNull("ALERT returned null", enumAlert);
 		assertNotNull("NOT_SUPPORTED returned null", enumNotSupported);
-
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "unKNowN";
 		try {
@@ -43,7 +52,10 @@ public class ComponentVolumeStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -54,7 +66,10 @@ public class ComponentVolumeStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of ComponentVolumeStatus.
+	 */
 	public void testListEnum() {
  		List<ComponentVolumeStatus> enumValueList = Arrays.asList(ComponentVolumeStatus.values());
 
@@ -68,6 +83,5 @@ public class ComponentVolumeStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
index d53d7bdd2..71c15d0fb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.DeviceLevelStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.DeviceLevelStatus}
+ */
 public class DeviceLevelStatusTests extends TestCase{
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "ZERO_LEVEL_BARS";
 		DeviceLevelStatus enumZeroLevel = DeviceLevelStatus.valueForString(example);
@@ -31,7 +38,10 @@ public class DeviceLevelStatusTests extends TestCase{
 		assertNotNull("FOUR_LEVEL_BARS returned null", enumFourLevel);
 		assertNotNull("NOT_PROVIDED returned null", enumNotProvided);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "onE_LeVeL_barS";
 		try {
@@ -42,7 +52,10 @@ public class DeviceLevelStatusTests extends TestCase{
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -53,7 +66,10 @@ public class DeviceLevelStatusTests extends TestCase{
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of DeviceLevelStatus.
+	 */
 	public void testListEnum() {
  		List<DeviceLevelStatus> enumValueList = Arrays.asList(DeviceLevelStatus.values());
  		
@@ -67,7 +83,5 @@ public class DeviceLevelStatusTests extends TestCase{
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DimensionTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DimensionTests.java
index b35b5cd34..035ac202a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DimensionTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DimensionTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.Dimension;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.Dimension}
+ */
 public class DimensionTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NO_FIX";
 		Dimension enumNoFix = Dimension.valueForString(example);
@@ -23,6 +30,9 @@ public class DimensionTests extends TestCase {
 		assertNotNull("3D returned null", enum3D);
 	}
 
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "no_FiX";
 		try {
@@ -33,8 +43,10 @@ public class DimensionTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -46,6 +58,9 @@ public class DimensionTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies the possible enum values of Dimension.
+	 */
 	public void testListEnum() {
  		List<Dimension> enumValueList = Arrays.asList(Dimension.values());
 
@@ -57,5 +72,4 @@ public class DimensionTests extends TestCase {
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
 	}
-	
-}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
index 2abee3cf3..83af2561e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.DisplayType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.DisplayType}
+ */
 public class DisplayTypeTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "CID";
 		DisplayType enumCid = DisplayType.valueForString(example);
@@ -43,9 +50,10 @@ public class DisplayTypeTests extends TestCase {
 		assertNotNull("MFD5 returned null", enumMfd5);
 		assertNotNull("GEN3_8-INCH returned null", enumGen3_8Inch);
 	}
-	
 
-	//use this test if it's supposed to throw an exception
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "cId";
 		try {
@@ -56,8 +64,10 @@ public class DisplayTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -69,6 +79,9 @@ public class DisplayTypeTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies the possible enum values of DisplayType.
+	 */
 	public void testListEnum() {
  		List<DisplayType> enumValueList = Arrays.asList(DisplayType.values());
 
@@ -86,6 +99,5 @@ public class DisplayTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
index 95785d501..2d85caa21 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.DriverDistractionState;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.DriverDistractionState}
+ */
 public class DriverDistractionStateTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "DD_ON";
 		DriverDistractionState enumDdOn = DriverDistractionState.valueForString(example);
@@ -19,7 +26,10 @@ public class DriverDistractionStateTests extends TestCase {
 		assertNotNull("DD_ON returned null", enumDdOn);
 		assertNotNull("DD_OFF returned null", enumDdOff);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "dD_oN";
 		try {
@@ -30,7 +40,10 @@ public class DriverDistractionStateTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -41,7 +54,10 @@ public class DriverDistractionStateTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of DriverDistractionState.
+	 */
 	public void testListEnum() {
  		List<DriverDistractionState> enumValueList = Arrays.asList(DriverDistractionState.values());
 
@@ -51,6 +67,5 @@ public class DriverDistractionStateTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
index 28f106617..9ce602ee1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ECallConfirmationStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ECallConfirmationStatus}
+ */
 public class ECallConfirmationStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NORMAL";
 		ECallConfirmationStatus enumNormal = ECallConfirmationStatus.valueForString(example);
@@ -34,7 +41,10 @@ public class ECallConfirmationStatusTests extends TestCase {
 		assertNotNull("ECALL_CONFIGURED_OFF returned null", enumConfiguredOff);
 		assertNotNull("CALL_COMPLETE_DTMF_TIMEOUT returned null", enumCompleteDtmfTimeout);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "noRMal";
 		try {
@@ -45,7 +55,10 @@ public class ECallConfirmationStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -56,7 +69,10 @@ public class ECallConfirmationStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of ECallConfirmationStatus.
+	 */
 	public void testListEnum() {
  		List<ECallConfirmationStatus> enumValueList = Arrays.asList(ECallConfirmationStatus.values());
 
@@ -71,6 +87,5 @@ public class ECallConfirmationStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
index ce83ef7a1..21823e4bd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.EmergencyEventType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.EmergencyEventType}
+ */
 public class EmergencyEventTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NO_EVENT";
 		EmergencyEventType enumEventType = EmergencyEventType.valueForString(example);
@@ -34,7 +41,10 @@ public class EmergencyEventTypeTests extends TestCase {
 		assertNotNull("NOT_SUPPORTED returned null", enumNotSupported);
 		assertNotNull("FAULT returned null", enumFault);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "nO_EvenT";
 		try {
@@ -45,7 +55,10 @@ public class EmergencyEventTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -56,7 +69,10 @@ public class EmergencyEventTypeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of EmergencyEvent.
+	 */
 	public void testListEnum() {
  		List<EmergencyEventType> enumValueList = Arrays.asList(EmergencyEventType.values());
 
@@ -71,6 +87,5 @@ public class EmergencyEventTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FileTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
index 1294dd02d..4db206cad 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.FileType}
+ */
 public class FileTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "GRAPHIC_BMP";
 		FileType enumGraphicBmp = FileType.valueForString(example);
@@ -37,7 +44,10 @@ public class FileTypeTests extends TestCase {
 		assertNotNull("BINARY returned null", enumBinary);
 		assertNotNull("JSON returned null", enumJson);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "uSer_ExiT";
 		try {
@@ -48,7 +58,10 @@ public class FileTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -60,6 +73,9 @@ public class FileTypeTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of FileType.
+	 */
 	public void testListEnum() {
  		List<FileType> enumValueList = Arrays.asList(FileType.values());
 
@@ -75,6 +91,5 @@ public class FileTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
index d027a0484..4900203f2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.FuelCutoffStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.FuelCutoffStatus}
+ */
 public class FuelCutoffStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "TERMINATE_FUEL";
 		FuelCutoffStatus enumTerminateFuel = FuelCutoffStatus.valueForString(example);
@@ -22,7 +29,10 @@ public class FuelCutoffStatusTests extends TestCase {
 		assertNotNull("NORMAL_OPERATION returned null", enumNormalOperation);
 		assertNotNull("FAULT returned null", enumFault);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "tErmINAte_FueL";
 		try {
@@ -33,7 +43,10 @@ public class FuelCutoffStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -43,8 +56,11 @@ public class FuelCutoffStatusTests extends TestCase {
 		catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
 		}
-	}	
-	
+	}		
+
+	/**
+	 * Verifies the possible enum values of FuelCutoffStatus.
+	 */
 	public void testListEnum() {
  		List<FuelCutoffStatus> enumValueList = Arrays.asList(FuelCutoffStatus.values());
 
@@ -55,6 +71,5 @@ public class FuelCutoffStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GearShiftAdviceStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GearShiftAdviceStatusTests.java
index 89349a1e5..38d5ac713 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GearShiftAdviceStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GearShiftAdviceStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.GearShiftAdviceStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.GearShiftAdviceStatus}
+ */
 public class GearShiftAdviceStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NO_INDICATION";
 		GearShiftAdviceStatus enumNoIndication = GearShiftAdviceStatus.valueForString(example);
@@ -31,7 +38,10 @@ public class GearShiftAdviceStatusTests extends TestCase {
 		assertNotNull("DOWNSHIFT_RECOMMENDATION returned null", enumDownshiftRecommendation);
 		assertNotNull("SHIFT_TO_NEUTRAL returned null", enumShiftToNeutral);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "no_INdICaTIon";
 		try {
@@ -42,7 +52,10 @@ public class GearShiftAdviceStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -54,6 +67,10 @@ public class GearShiftAdviceStatusTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of GearShiftAdviceStatus.
+	 */
 	public void testListEnum() {
  		List<GearShiftAdviceStatus> enumValueList = Arrays.asList(GearShiftAdviceStatus.values());
 
@@ -67,6 +84,5 @@ public class GearShiftAdviceStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
index 5c369fcf9..fd7388a6c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.GlobalProperty;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.GlobalProperty}
+ */
 public class GlobalPropertyTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "HELPPROMPT";
 		GlobalProperty enumHelpPrompt = GlobalProperty.valueForString(example);
@@ -34,7 +41,10 @@ public class GlobalPropertyTests extends TestCase {
 		assertNotNull("MENUICON returned null", enumMenuIcon);
 		assertNotNull("KEYBOARDPROPERTIES returned null", enumKeyboardProperties);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "heLp_ProMPt";
 		try {
@@ -45,7 +55,10 @@ public class GlobalPropertyTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -56,7 +69,10 @@ public class GlobalPropertyTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of GlobalProperty.
+	 */
 	public void testListEnum() {
  		List<GlobalProperty> enumValueList = Arrays.asList(GlobalProperty.values());
 
@@ -71,6 +87,5 @@ public class GlobalPropertyTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
index 5d712290b..b64f9e42b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
@@ -8,8 +8,15 @@ import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 
 import junit.framework.TestCase;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.HmiLevel}
+ */
 public class HmiLevelTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "FULL";
 		HMILevel enumFull = HMILevel.valueForString(example);
@@ -26,7 +33,9 @@ public class HmiLevelTests extends TestCase {
 		assertNotNull("NONE returned null", enumNone);
 	}
 
-	//use this test if it's supposed to throw an exception
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "fUlL";
 		try {
@@ -37,8 +46,10 @@ public class HmiLevelTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -49,7 +60,10 @@ public class HmiLevelTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies the possible enum values of HMILevel.
+	 */
 	public void testListEnum() {
  		List<HMILevel> enumValueList = Arrays.asList(HMILevel.values());
 
@@ -61,6 +75,5 @@ public class HmiLevelTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
index 6fc3163e8..ebe8227c2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.HmiZoneCapabilities}
+ */
 public class HmiZoneCapabilitiesTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "FRONT";
 		HmiZoneCapabilities enumFront = HmiZoneCapabilities.valueForString(example);
@@ -19,7 +26,10 @@ public class HmiZoneCapabilitiesTests extends TestCase {
 		assertNotNull("FRONT returned null", enumFront);
 		assertNotNull("BACK returned null", enumBack);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "fROnT";
 		try {
@@ -30,7 +40,10 @@ public class HmiZoneCapabilitiesTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -42,6 +55,9 @@ public class HmiZoneCapabilitiesTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of HmiZoneCapabilities.
+	 */
 	public void testListEnum() {
  		List<HmiZoneCapabilities> enumValueList = Arrays.asList(HmiZoneCapabilities.values());
 
@@ -51,6 +67,5 @@ public class HmiZoneCapabilitiesTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
index be96a4865..fc9a8658a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.IgnitionStableStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.IgnitionStableStatus}
+ */
 public class IgnitionStableStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "IGNITION_SWITCH_NOT_STABLE";
 		IgnitionStableStatus enumIgnitionSwitchNotStable = IgnitionStableStatus.valueForString(example);
@@ -22,7 +29,10 @@ public class IgnitionStableStatusTests extends TestCase {
 		assertNotNull("IGNITION_SWITCH_STABLE returned null", enumIgnitionSwitchStable);
 		assertNotNull("MISSING_FROM_TRANSMITTER returned null", enumMissingFromTransmitter);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "iGnitIoN_SwiTch_NoT_StablE";
 		try {
@@ -33,7 +43,10 @@ public class IgnitionStableStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class IgnitionStableStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of IgnitionStableStatus.
+	 */
 	public void testListEnum() {
  		List<IgnitionStableStatus> enumValueList = Arrays.asList(IgnitionStableStatus.values());
 
@@ -55,6 +71,5 @@ public class IgnitionStableStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
index f5f0901ae..8fc1992ab 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.IgnitionStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.IgnitionStatus}
+ */
 public class IgnitionStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "UNKNOWN";
 		IgnitionStatus enumUnknown = IgnitionStatus.valueForString(example);
@@ -31,7 +38,10 @@ public class IgnitionStatusTests extends TestCase {
 		assertNotNull("START returned null", enumStart);
 		assertNotNull("INVALID returned null", enumInvalid);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "uNKnowN";
 		try {
@@ -42,7 +52,10 @@ public class IgnitionStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -53,7 +66,10 @@ public class IgnitionStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of IgnitionStatus.
+	 */
 	public void testListEnum() {
  		List<IgnitionStatus> enumValueList = Arrays.asList(IgnitionStatus.values());
 
@@ -67,6 +83,5 @@ public class IgnitionStatusTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
index 5b555fe25..a6cd64332 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ImageFieldName;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ImageFieldName}
+ */
 public class ImageFieldNameTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "softButtonImage";
 		ImageFieldName enumSoftButtonImage = ImageFieldName.valueForString(example);
@@ -46,7 +53,10 @@ public class ImageFieldNameTests extends TestCase {
 		assertNotNull("showConstantTBTIcon returned null", enumShowConstantTbtIcon);
 		assertNotNull("showConstantTBTNextTurnIcon returned null", enumShowConstantTbtNextTurnIcon);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "sofTbUtTOnImagE";
 		try {
@@ -57,7 +67,10 @@ public class ImageFieldNameTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -69,6 +82,9 @@ public class ImageFieldNameTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of ImageFieldName.
+	 */
 	public void testListEnum() {
  		List<ImageFieldName> enumValueList = Arrays.asList(ImageFieldName.values());
 
@@ -87,6 +103,5 @@ public class ImageFieldNameTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
index e8136a62e..fb3f609f3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.ImageType}
+ */
 public class ImageTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "STATIC";
 		ImageType enumStatic = ImageType.valueForString(example);
@@ -19,7 +26,10 @@ public class ImageTypeTests extends TestCase {
 		assertNotNull("STATIC returned null", enumStatic);
 		assertNotNull("DYNAMIC returned null", enumDynamic);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "sTatIc";
 		try {
@@ -30,7 +40,10 @@ public class ImageTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -41,7 +54,10 @@ public class ImageTypeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of ImageType.
+	 */
 	public void testListEnum() {
  		List<ImageType> enumValueList = Arrays.asList(ImageType.values());
 
@@ -51,6 +67,5 @@ public class ImageTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
index a391b1746..ab6490cea 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.InteractionMode}
+ */
 public class InteractionModeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "MANUAL_ONLY";
 		InteractionMode enumManualOnly = InteractionMode.valueForString(example);
@@ -22,7 +29,10 @@ public class InteractionModeTests extends TestCase {
 		assertNotNull("VR_ONLY returned null", enumVrOnly);
 		assertNotNull("BOTH returned null", enumBoth);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "maNuAL_OnlY";
 		try {
@@ -33,7 +43,10 @@ public class InteractionModeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class InteractionModeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of InteractionMode.
+	 */
 	public void testListEnum() {
  		List<InteractionMode> enumValueList = Arrays.asList(InteractionMode.values());
 
@@ -55,6 +71,5 @@ public class InteractionModeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/JingleTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/JingleTests.java
index f1195e09f..da5ea2836 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/JingleTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/JingleTests.java
@@ -8,9 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.Jingle;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.Jingle}
+ */
 public class JingleTests extends TestCase {
-	
-	// Verifies that the enum values are not null upon valid assignment.
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {
 		
 		String example = "POSITIVE_JINGLE";
@@ -31,7 +37,9 @@ public class JingleTests extends TestCase {
 		assertNotNull("HELP_JINGLE returned null", enumHelpJingle);
 	}
 
-	// Verifies that an invalid assignment is null.
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "posITive_JiGLE";
 		try {
@@ -41,8 +49,10 @@ public class JingleTests extends TestCase {
 			fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	// Verifies that a null assignment is invalid.
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -52,8 +62,10 @@ public class JingleTests extends TestCase {
 			fail("Null string throws NullPointerException.");
 		}
 	}
-	
-	// Verifies the possible enum values of Jingle.
+
+	/**
+	 * Verifies the possible enum values of Jingle.
+	 */
 	public void testListEnums () {
 		List<Jingle> enumValueList = Arrays.asList(Jingle.values());
 		List<Jingle> enumTestList = new ArrayList<Jingle>();
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
index 5d8af49e6..ba0b979bf 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.KeyboardEvent;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.KeyboardEvent}
+ */
 public class KeyboardEventTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "KEYPRESS";
 		KeyboardEvent enumKeypress = KeyboardEvent.valueForString(example);
@@ -25,7 +32,10 @@ public class KeyboardEventTests extends TestCase {
 		assertNotNull("ENTRY_CANCELLED returned null", enumEntryCancelled);
 		assertNotNull("ENTRY_ABORTED returned null", enumEntryAborted);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "keyPreSS";
 		try {
@@ -36,7 +46,10 @@ public class KeyboardEventTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class KeyboardEventTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of KeyboardEvent.
+	 */
 	public void testListEnum() {
  		List<KeyboardEvent> enumValueList = Arrays.asList(KeyboardEvent.values());
 
@@ -59,6 +75,5 @@ public class KeyboardEventTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
index 3539cbbb5..14d61aa51 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.KeyboardLayout;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.KeyboardLayout}
+ */
 public class KeyboardLayoutTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "QWERTY";
 		KeyboardLayout enumQwerty = KeyboardLayout.valueForString(example);
@@ -22,7 +29,10 @@ public class KeyboardLayoutTests extends TestCase {
 		assertNotNull("QWERTZ returned null", enumQwertz);
 		assertNotNull("AZERTY returned null", enumAzerty);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "qWerTY";
 		try {
@@ -33,7 +43,10 @@ public class KeyboardLayoutTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class KeyboardLayoutTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of KeyboardLayout.
+	 */
 	public void testListEnum() {
  		List<KeyboardLayout> enumValueList = Arrays.asList(KeyboardLayout.values());
 
@@ -55,6 +71,5 @@ public class KeyboardLayoutTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
index 3dcd77da1..8bd652969 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.KeypressMode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.KeypressMode}
+ */
 public class KeypressModeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "SINGLE_KEYPRESS";
 		KeypressMode enumSingleKeypress = KeypressMode.valueForString(example);
@@ -22,7 +29,10 @@ public class KeypressModeTests extends TestCase {
 		assertNotNull("QUEUE_KEYPRESSES returned null", enumQueueKeypresses);
 		assertNotNull("RESEND_CURRENT_ENTRY returned null", enumResendCurrentEntry);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "sIngLe_KeyPrESs";
 		try {
@@ -33,7 +43,10 @@ public class KeypressModeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class KeypressModeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of KeypressMode.
+	 */
 	public void testListEnum() {
  		List<KeypressMode> enumValueList = Arrays.asList(KeypressMode.values());
 
@@ -55,6 +71,5 @@ public class KeypressModeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LanguageTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LanguageTests.java
index 834a6f959..3679a9ffc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LanguageTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LanguageTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.Language;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.Language}
+ */
 public class LanguageTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "EN-US";
 		Language enumEnUs = Language.valueForString(example);
@@ -86,7 +93,9 @@ public class LanguageTests extends TestCase {
 		assertNotNull("NO-NO returned null", enumNoNo);
 	}
 
-	//use this test if it's supposed to throw an exception
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "eN-Us";
 		try {
@@ -97,8 +106,10 @@ public class LanguageTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -109,7 +120,10 @@ public class LanguageTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies the possible enum values of Language.
+	 */
 	public void testListEnum() {
  		List<Language> enumValueList = Arrays.asList(Language.values());
 
@@ -142,6 +156,5 @@ public class LanguageTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
index 7fc19a97f..904a39520 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.LayoutMode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.LayoutMode}
+ */
 public class LayoutModeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "ICON_ONLY";
 		LayoutMode enumIconOnly = LayoutMode.valueForString(example);
@@ -28,7 +35,10 @@ public class LayoutModeTests extends TestCase {
 		assertNotNull("LIST_WITH_SEARCH returned null", enumListWithSearch);
 		assertNotNull("KEYBOARD returned null", enumKeyboard);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "icOn_OnlY";
 		try {
@@ -39,7 +49,10 @@ public class LayoutModeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -51,6 +64,10 @@ public class LayoutModeTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of LayoutMode.
+	 */
 	public void testListEnum() {
  		List<LayoutMode> enumValueList = Arrays.asList(LayoutMode.values());
 
@@ -63,6 +80,5 @@ public class LayoutModeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LightSwitchStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LightSwitchStatusTests.java
index 33afa979e..cb020b9da 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LightSwitchStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LightSwitchStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.LightSwitchStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.LightSwitchStatus}
+ */
 public class LightSwitchStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "OFF";
 		LightSwitchStatus enumOff = LightSwitchStatus.valueForString(example);
@@ -25,7 +32,10 @@ public class LightSwitchStatusTests extends TestCase {
 		assertNotNull("HEADLAMP returned null", enumHeadlamp);
 		assertNotNull("AUTOLAMP returned null", enumAutolamp);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "oFf";
 		try {
@@ -36,7 +46,10 @@ public class LightSwitchStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class LightSwitchStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of LightSwitchStatus.
+	 */
 	public void testListEnum() {
  		List<LightSwitchStatus> enumValueList = Arrays.asList(LightSwitchStatus.values());
 
@@ -59,6 +75,5 @@ public class LightSwitchStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
index 6273794c8..ed380d607 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.LockScreenStatus}
+ */
 public class LockScreenStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "REQUIRED";
 		LockScreenStatus enumRequired = LockScreenStatus.valueForString(example);
@@ -22,7 +29,10 @@ public class LockScreenStatusTests extends TestCase {
 		assertNotNull("OPTIONAL returned null", enumOptional);
 		assertNotNull("OFF returned null", enumOff);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "ReqUireD";
 		try {
@@ -33,7 +43,10 @@ public class LockScreenStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class LockScreenStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of LockScreenStatus.
+	 */
 	public void testListEnum() {
  		List<LockScreenStatus> enumValueList = Arrays.asList(LockScreenStatus.values());
 
@@ -55,6 +71,5 @@ public class LockScreenStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java
index 93a3df287..6a63acaad 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.MaintenanceModeStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.MaintenanceModeStatus}
+ */
 public class MaintenanceModeStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NORMAL";
 		MaintenanceModeStatus enumNormal = MaintenanceModeStatus.valueForString(example);
@@ -25,7 +32,10 @@ public class MaintenanceModeStatusTests extends TestCase {
 		assertNotNull("ACTIVE returned null", enumActive);
 		assertNotNull("FEATURE_NOT_PRESENT returned null", enumFeatureNotPresent);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "NorMal";
 		try {
@@ -36,7 +46,10 @@ public class MaintenanceModeStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class MaintenanceModeStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of MaintenanceMode.
+	 */
 	public void testListEnum() {
  		List<MaintenanceModeStatus> enumValueList = Arrays.asList(MaintenanceModeStatus.values());
 
@@ -59,6 +75,5 @@ public class MaintenanceModeStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
index b610224eb..1895430e5 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.MediaClockFormat;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.MediaClockFormat}
+ */
 public class MediaClockFormatTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "CLOCK1";
 		MediaClockFormat enumClock1 = MediaClockFormat.valueForString(example);
@@ -34,7 +41,10 @@ public class MediaClockFormatTests extends TestCase {
 		assertNotNull("CLOCKTEXT3 returned null", enumClockText3);
 		assertNotNull("CLOCKTEXT4 returned null", enumClockText4);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "cloCK1";
 		try {
@@ -45,7 +55,10 @@ public class MediaClockFormatTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -55,8 +68,11 @@ public class MediaClockFormatTests extends TestCase {
 		catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
 		}
-	}	
-	
+	}		
+
+	/**
+	 * Verifies the possible enum values of MediaClockFormat.
+	 */
 	public void testListEnum() {
  		List<MediaClockFormat> enumValueList = Arrays.asList(MediaClockFormat.values());
 
@@ -71,6 +87,5 @@ public class MediaClockFormatTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MessageTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MessageTypeTests.java
index f881872dc..45bdfd561 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MessageTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MessageTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.MessageType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.MessageType}
+ */
 public class MessageTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "request";
 		MessageType enumRequest = MessageType.valueForString(example);
@@ -22,7 +29,10 @@ public class MessageTypeTests extends TestCase {
 		assertNotNull("response returned null", enumResponse);
 		assertNotNull("notification returned null", enumNotification);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "reQuesT";
 		try {
@@ -33,7 +43,10 @@ public class MessageTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -45,6 +58,10 @@ public class MessageTypeTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of MessageType.
+	 */
 	public void testListEnum() {
  		List<MessageType> enumValueList = Arrays.asList(MessageType.values());
 
@@ -55,6 +72,5 @@ public class MessageTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java
index d9008807a..2dc171c25 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.PermissionStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.PermissionStatus}
+ */
 public class PermissionStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "ALLOWED";
 		PermissionStatus enumAllowed = PermissionStatus.valueForString(example);
@@ -25,7 +32,10 @@ public class PermissionStatusTests extends TestCase {
 		assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
 		assertNotNull("USER_CONSENT_PENDING returned null", enumUserConsentPending);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "aLloWed";
 		try {
@@ -36,7 +46,10 @@ public class PermissionStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class PermissionStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of PermissionStatus.
+	 */
 	public void testListEnum() {
  		List<PermissionStatus> enumValueList = Arrays.asList(PermissionStatus.values());
 
@@ -59,6 +75,5 @@ public class PermissionStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
index aafff4a57..f3a2a3540 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.PowerModeQualificationStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.PowerModeQualificationStatus}
+ */
 public class PowerModeQualificationStatusTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "POWER_MODE_UNDEFINED";
 		PowerModeQualificationStatus enumPowerModeUndefined = PowerModeQualificationStatus.valueForString(example);
@@ -25,7 +32,10 @@ public class PowerModeQualificationStatusTests extends TestCase {
 		assertNotNull("NOT_DEFINED returned null", enumNotDefined);
 		assertNotNull("POWER_MODE_OK returned null", enumPowerModeOk);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "poweR_moDE_UndEfiNEd";
 		try {
@@ -36,7 +46,10 @@ public class PowerModeQualificationStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -47,7 +60,10 @@ public class PowerModeQualificationStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of PowerModeQualificationStatus.
+	 */
 	public void testListEnum() {
  		List<PowerModeQualificationStatus> enumValueList = Arrays.asList(PowerModeQualificationStatus.values());
 
@@ -59,6 +75,5 @@ public class PowerModeQualificationStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
index 722bd9642..9154a06f0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.PowerModeStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.PowerModeStatus}
+ */
 public class PowerModeStatusTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "KEY_OUT";
 		PowerModeStatus enumKeyOut = PowerModeStatus.valueForString(example);
@@ -40,7 +47,10 @@ public class PowerModeStatusTests extends TestCase {
 		assertNotNull("RUNNING_2 returned null", enumRunning2);
 		assertNotNull("CRANK_3 returned null", enumCrank3);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "key_Out";
 		try {
@@ -51,7 +61,10 @@ public class PowerModeStatusTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -62,7 +75,10 @@ public class PowerModeStatusTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of PowerModeStatus.
+	 */
 	public void testListEnum() {
  		List<PowerModeStatus> enumValueList = Arrays.asList(PowerModeStatus.values());
 
@@ -79,6 +95,5 @@ public class PowerModeStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
index 543a3074d..9ab3c9db8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.PrerecordedSpeech;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.PrerecordedSpeech}
+ */
 public class PrerecordedSpeechTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "HELP_JINGLE";
 		PrerecordedSpeech enumHelpJingle = PrerecordedSpeech.valueForString(example);
@@ -28,7 +35,10 @@ public class PrerecordedSpeechTests extends TestCase {
 		assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle);
 		assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "heLP_JingLE";
 		try {
@@ -39,7 +49,10 @@ public class PrerecordedSpeechTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -50,7 +63,10 @@ public class PrerecordedSpeechTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of PrerecordedSpeech.
+	 */
 	public void testListEnum() {
  		List<PrerecordedSpeech> enumValueList = Arrays.asList(PrerecordedSpeech.values());
 
@@ -64,4 +80,4 @@ public class PrerecordedSpeechTests extends TestCase {
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
 	}
-}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
index 3956dec56..94c2e2b39 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
@@ -8,8 +8,16 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.PrimaryAudioSource;
 
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.PrimaryAudioSource}
+ */
 public class PrimaryAudioSourceTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NO_SOURCE_SELECTED";
 		PrimaryAudioSource enumNoSourceSelected = PrimaryAudioSource.valueForString(example);
@@ -34,7 +42,10 @@ public class PrimaryAudioSourceTests extends TestCase {
 		assertNotNull("IPOD returned null", enumIpod);
 		assertNotNull("MOBILE_APP returned null", enumMobileApp);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "no_SouRCe_SelEcteD";
 		try {
@@ -45,7 +56,10 @@ public class PrimaryAudioSourceTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -57,6 +71,10 @@ public class PrimaryAudioSourceTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of PrimaryAudioSource.
+	 */
 	public void testListEnum() {
  		List<PrimaryAudioSource> enumValueList = Arrays.asList(PrimaryAudioSource.values());
 
@@ -71,6 +89,5 @@ public class PrimaryAudioSourceTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrndlTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrndlTests.java
index ff7f9842a..fabf94177 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrndlTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrndlTests.java
@@ -8,8 +8,16 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.PRNDL;
 
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.Prndl}
+ */
 public class PrndlTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "PARK";
 		PRNDL enumPark = PRNDL.valueForString(example);
@@ -61,7 +69,10 @@ public class PrndlTests extends TestCase {
 		assertNotNull("UNKNOWN returned null", enumUnknown);
 		assertNotNull("FAULT returned null", enumFault);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "pARk";
 		try {
@@ -72,7 +83,10 @@ public class PrndlTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -83,7 +97,10 @@ public class PrndlTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of PRNDL.
+	 */
 	public void testListEnum() {
  		List<PRNDL> enumValueList = Arrays.asList(PRNDL.values());
 
@@ -107,6 +124,5 @@ public class PrndlTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
index 05060484b..f81e04213 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.RequestType}
+ */
 public class RequestTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "HTTP";
 		RequestType enumHttp = RequestType.valueForString(example);
@@ -31,7 +38,10 @@ public class RequestTypeTests extends TestCase {
 		assertNotNull("AUTH_ACK returned null", enumAuthAck);
 		assertNotNull("PROPRIETARY returned null", enumProprietary);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "hTTp";
 		try {
@@ -42,7 +52,10 @@ public class RequestTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -53,7 +66,10 @@ public class RequestTypeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of RequestType.
+	 */
 	public void testListEnum() {
  		List<RequestType> enumValueList = Arrays.asList(RequestType.values());
 
@@ -67,6 +83,5 @@ public class RequestTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ResultTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ResultTests.java
index e19cef7c7..3eaae9937 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ResultTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ResultTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.Result;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.Result}
+ */
 public class ResultTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "SUCCESS";
 		Result enumSuccess = Result.valueForString(example);
@@ -109,7 +116,10 @@ public class ResultTests extends TestCase {
 		assertNotNull("EXPIRED_CERT returned null", enumExpiredCert);
 		assertNotNull("RESUME_FAILED returned null", enumResumeFailed);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "suCcesS";
 		try {
@@ -120,7 +130,10 @@ public class ResultTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -131,7 +144,10 @@ public class ResultTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of Result.
+	 */
 	public void testListEnum() {
  		List<Result> enumValueList = Arrays.asList(Result.values());
 
@@ -171,6 +187,5 @@ public class ResultTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
index cba1e6af3..062ce7df3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.SamplingRate}
+ */
 public class SamplingRateTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "8KHZ";
 		SamplingRate enum8Khz = SamplingRate.valueForString(example);
@@ -26,7 +33,9 @@ public class SamplingRateTests extends TestCase {
 		assertNotNull("44KHZ returned null", enum44Khz);
 	}
 
-	//use this test if it's supposed to throw an exception
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "8kHz";
 		try {
@@ -37,8 +46,10 @@ public class SamplingRateTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -49,7 +60,10 @@ public class SamplingRateTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies the possible enum values of SamplingRate.
+	 */
 	public void testListEnum() {
  		List<SamplingRate> enumValueList = Arrays.asList(SamplingRate.values());
 
@@ -61,6 +75,5 @@ public class SamplingRateTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
index caf2fd032..e8e7b7d7e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
@@ -6,10 +6,19 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import com.smartdevicelink.proxy.rpc.enums.AppInterfaceUnregisteredReason;
 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
+import com.smartdevicelink.test.Test;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.SdlDisconnectedReason}
+ */
 public class SdlDisconnectedReasonTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "USER_EXIT";
 		SdlDisconnectedReason enumUserExit = SdlDisconnectedReason.valueForString(example);
@@ -73,7 +82,10 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		assertNotNull("APP_INTERFACE_UNREG returned null", enumAppInterfaceUnreg);
 		assertNotNull("GENERIC_ERROR returned null", enumGenericError);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "uSer_ExiT";
 		try {
@@ -84,7 +96,10 @@ public class SdlDisconnectedReasonTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -94,8 +109,11 @@ public class SdlDisconnectedReasonTests extends TestCase {
 		catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
 		}
-	}	
-	
+	}		
+
+	/**
+	 * Verifies the possible enum values of SdlDisconnectedReason.
+	 */
 	public void testListEnum() {
  		List<SdlDisconnectedReason> enumValueList = Arrays.asList(SdlDisconnectedReason.values());
 
@@ -125,6 +143,23 @@ public class SdlDisconnectedReasonTests extends TestCase {
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
 	}
 	
-	//TODO: add test cases for convertAppInterfaceUnregisteredReason method
+	/**
+	 * Verifies the valid returns of the conversion method,
+	 * {@link com.smartdevicelink.rpc.enums.SdlDisconnectedReason#convertAppInterfaceunregisteredReason(AppInterfaceUnregisteredReason)}
+	 */
+	public void testConvertMethod () {		
+		assertEquals(Test.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.BLUETOOTH_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.BLUETOOTH_OFF));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.FACTORY_DEFAULTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.IGNITION_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.IGNITION_OFF));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.LANGUAGE_CHANGE, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.MASTER_RESET, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.MASTER_RESET));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT));
+		assertEquals(Test.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null));
+	}
 	
-}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
index d2989a9f0..d4ef5c0ff 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.SoftButtonType}
+ */
 public class SoftButtonTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "TEXT";
 		SoftButtonType enumText = SoftButtonType.valueForString(example);
@@ -23,7 +30,10 @@ public class SoftButtonTypeTests extends TestCase {
 		assertNotNull("BOTH returned null", enumBoth);
 	}
 
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "teXT";
 		try {
@@ -34,8 +44,10 @@ public class SoftButtonTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
-	//use this test if it's supposed to throw an exception
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -46,7 +58,10 @@ public class SoftButtonTypeTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies the possible enum values of SoftButtonType.
+	 */
 	public void testListEnum() {
  		List<SoftButtonType> enumValueList = Arrays.asList(SoftButtonType.values());
 
@@ -57,6 +72,5 @@ public class SoftButtonTypeTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
index 00887449a..2ed1b4a77 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.SpeechCapabilities}
+ */
 public class SpeechCapabilitiesTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "TEXT";
 		SpeechCapabilities enumText = SpeechCapabilities.valueForString(example);
@@ -28,7 +35,10 @@ public class SpeechCapabilitiesTests extends TestCase {
 		assertNotNull("PRE_RECORDED returned null", enumPreRecorded);
 		assertNotNull("SILENCE returned null", enumSilence);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "teXT";
 		try {
@@ -39,7 +49,10 @@ public class SpeechCapabilitiesTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -50,7 +63,10 @@ public class SpeechCapabilitiesTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of SpeechCapabilities.
+	 */
 	public void testListEnum() {
  		List<SpeechCapabilities> enumValueList = Arrays.asList(SpeechCapabilities.values());
 
@@ -63,6 +79,5 @@ public class SpeechCapabilitiesTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemActionTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
index a3349c491..807da0b8a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.SystemAction}
+ */
 public class SystemActionTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "DEFAULT_ACTION";
 		SystemAction enumDefaultAction = SystemAction.valueForString(example);
@@ -22,7 +29,10 @@ public class SystemActionTests extends TestCase {
 		assertNotNull("STEAL_FOCUS returned null", enumStealFocus);
 		assertNotNull("KEEP_CONTEXT returned null", enumKeepContext);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "deFaulT_ActiON";
 		try {
@@ -33,7 +43,10 @@ public class SystemActionTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class SystemActionTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of SystemAction.
+	 */
 	public void testListEnum() {
  		List<SystemAction> enumValueList = Arrays.asList(SystemAction.values());
 
@@ -55,6 +71,5 @@ public class SystemActionTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemContextTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
index 8f2313eba..9b325492e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.SystemContext;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.SystemContext}
+ */
 public class SystemContextTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "MAIN";
 		SystemContext enumMain = SystemContext.valueForString(example);
@@ -29,6 +36,9 @@ public class SystemContextTests extends TestCase {
 		assertNotNull("ALERT returned null", enumAlert);
 	}
 
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "mAIn";
 		try {
@@ -39,7 +49,10 @@ public class SystemContextTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -50,7 +63,10 @@ public class SystemContextTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies the possible enum values of SystemContext.
+	 */
 	public void testListEnum() {
  		List<SystemContext> enumValueList = Arrays.asList(SystemContext.values());
 
@@ -63,6 +79,5 @@ public class SystemContextTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TbtStateTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
index ca74d20fb..1fbf8055a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TBTState;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.TbtState}
+ */
 public class TbtStateTests extends TestCase {
-	
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "ROUTE_UPDATE_REQUEST";
 		TBTState enumRouteUpdateRequest = TBTState.valueForString(example);
@@ -43,7 +50,10 @@ public class TbtStateTests extends TestCase {
 		assertNotNull("TRIP_STATUS_REQUEST returned null", enumTripStatusRequest);
 		assertNotNull("ROUTE_UPDATE_REQUEST_TIMEOUT returned null", enumRouteUpdateRequestTimeout);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "rOUte_UpDAte_reQuesT";
 		try {
@@ -54,7 +64,10 @@ public class TbtStateTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -65,7 +78,10 @@ public class TbtStateTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of TBTState.
+	 */
 	public void testListEnum() {
  		List<TBTState> enumValueList = Arrays.asList(TBTState.values());
 
@@ -84,5 +100,4 @@ public class TbtStateTests extends TestCase {
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
 	}
-
-}
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
index 3647caf6d..1b1130806 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.TextAlignment}
+ */
 public class TextAlignmentTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "LEFT_ALIGNED";
 		TextAlignment enumLeftAligned = TextAlignment.valueForString(example);
@@ -22,7 +29,10 @@ public class TextAlignmentTests extends TestCase {
 		assertNotNull("RIGHT_ALIGNED returned null", enumRightAligned);
 		assertNotNull("CENTERED returned null", enumCentered);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "leFT_AliGned";
 		try {
@@ -33,7 +43,10 @@ public class TextAlignmentTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -44,7 +57,10 @@ public class TextAlignmentTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of TextAlignment.
+	 */
 	public void testListEnum() {
  		List<TextAlignment> enumValueList = Arrays.asList(TextAlignment.values());
 
@@ -55,6 +71,5 @@ public class TextAlignmentTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
index 79059f961..c8a80fc25 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.TextFieldName}
+ */
 public class TextFieldNameTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "mainField1";
 		TextFieldName enumMainField1 = TextFieldName.valueForString(example);
@@ -85,7 +92,10 @@ public class TextFieldNameTests extends TestCase {
 		assertNotNull("tertiaryText returned null", enumTertiaryText);
 		assertNotNull("menuTitle returned null", enumMenuTitle);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "mAinField1";
 		try {
@@ -96,7 +106,10 @@ public class TextFieldNameTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -107,7 +120,10 @@ public class TextFieldNameTests extends TestCase {
             fail("Null string throws NullPointerException.");
 		}
 	}	
-	
+
+	/**
+	 * Verifies the possible enum values of TextFieldName.
+	 */
 	public void testListEnum() {
  		List<TextFieldName> enumValueList = Arrays.asList(TextFieldName.values());
 
@@ -139,6 +155,5 @@ public class TextFieldNameTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TirePressureTellTaleTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TirePressureTellTaleTests.java
index df72c3812..cc56dc63f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TirePressureTellTaleTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TirePressureTellTaleTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TirePressureTellTale;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.TirePressureTellTale}
+ */
 public class TirePressureTellTaleTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "OFF";
 		TirePressureTellTale enumOff = TirePressureTellTale.valueForString(example);
@@ -22,7 +29,10 @@ public class TirePressureTellTaleTests extends TestCase {
 		assertNotNull("ON returned null", enumOn);
 		assertNotNull("FLASH returned null", enumFlash);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "oFf";
 		try {
@@ -33,7 +43,10 @@ public class TirePressureTellTaleTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -45,6 +58,10 @@ public class TirePressureTellTaleTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of TirePressureTellTale.
+	 */
 	public void testListEnum() {
  		List<TirePressureTellTale> enumValueList = Arrays.asList(TirePressureTellTale.values());
 
@@ -55,6 +72,5 @@ public class TirePressureTellTaleTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
index fbbc5b23f..06636a045 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TouchType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.TouchType}
+ */
 public class TouchTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "BEGIN";
 		TouchType enumBegin = TouchType.valueForString(example);
@@ -22,7 +29,10 @@ public class TouchTypeTests extends TestCase {
 		assertNotNull("MOVE returned null", enumMove);
 		assertNotNull("END returned null", enumEnd);
 	}
-	
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "bEgIn";
 		try {
@@ -33,7 +43,10 @@ public class TouchTypeTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -45,6 +58,10 @@ public class TouchTypeTests extends TestCase {
 		}
 	}	
 	
+
+	/**
+	 * Verifies the possible enum values of TouchType.
+	 */
 	public void testListEnum() {
  		List<TouchType> enumValueList = Arrays.asList(TouchType.values());
 
@@ -55,6 +72,5 @@ public class TouchTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
index a82c80aea..5197dec64 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.TriggerSource}
+ */
 public class TriggerSourceTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "MENU";
 		TriggerSource enumMenu = TriggerSource.valueForString(example);
@@ -23,6 +30,9 @@ public class TriggerSourceTests extends TestCase {
 		assertNotNull("KEYBOARD returned null", enumKeyboard);
 	}
 
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "meNU";
 		try {
@@ -33,7 +43,10 @@ public class TriggerSourceTests extends TestCase {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
-	
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -45,6 +58,10 @@ public class TriggerSourceTests extends TestCase {
 		}
 	}
 	
+
+	/**
+	 * Verifies the possible enum values of TriggerSource.
+	 */
 	public void testListEnum() {
  		List<TriggerSource> enumValueList = Arrays.asList(TriggerSource.values());
 
@@ -55,6 +72,5 @@ public class TriggerSourceTests extends TestCase {
 		
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
index 473dfac3f..2c808ef03 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.UpdateMode}
+ */
 public class UpdateModeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "COUNTUP";
 		UpdateMode enumCountUp = UpdateMode.valueForString(example);
@@ -29,6 +36,9 @@ public class UpdateModeTests extends TestCase {
 		assertNotNull("CLEAR returned null", enumClear);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "coUnTUp";
 		try {
@@ -40,6 +50,9 @@ public class UpdateModeTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -51,6 +64,9 @@ public class UpdateModeTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of UpdateMode.
+	 */
 	public void testListEnum() {
  		List<UpdateMode> enumValueList = Arrays.asList(UpdateMode.values());
 
@@ -63,6 +79,5 @@ public class UpdateModeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java
index f9e2c9e80..ee4811c57 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataActiveStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VehicleDataActiveStatus}
+ */
 public class VehicleDataActiveStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "INACTIVE_NOT_CONFIRMED";
 		VehicleDataActiveStatus enumInactiveNotConfirmed = VehicleDataActiveStatus.valueForString(example);
@@ -29,6 +36,9 @@ public class VehicleDataActiveStatusTests extends TestCase {
 		assertNotNull("FAULT returned null", enumFault);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "InACtivE_NoT_ConFIRmED";
 		try {
@@ -40,6 +50,9 @@ public class VehicleDataActiveStatusTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -51,6 +64,9 @@ public class VehicleDataActiveStatusTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of VehicleDataActiveStatus.
+	 */
 	public void testListEnum() {
  		List<VehicleDataActiveStatus> enumValueList = Arrays.asList(VehicleDataActiveStatus.values());
 
@@ -63,6 +79,5 @@ public class VehicleDataActiveStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
index 9271d0d16..bcee65b19 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VehicleDataEventStatus}
+ */
 public class VehicleDataEventStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NO_EVENT";
 		VehicleDataEventStatus enumNoEvent = VehicleDataEventStatus.valueForString(example);
@@ -29,6 +36,9 @@ public class VehicleDataEventStatusTests extends TestCase {
 		assertNotNull("FAULT returned null", enumFault);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "no_EveNT";
 		try {
@@ -40,6 +50,9 @@ public class VehicleDataEventStatusTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -51,6 +64,9 @@ public class VehicleDataEventStatusTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of AmbientLightStatus.
+	 */
 	public void testListEnum() {
  		List<VehicleDataEventStatus> enumValueList = Arrays.asList(VehicleDataEventStatus.values());
 
@@ -63,6 +79,5 @@ public class VehicleDataEventStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
index 019cc2541..af2f45714 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataNotificationStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VehicleDataNotificationStatus}
+ */
 public class VehicleDataNotificationStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NOT_SUPPORTED";
 		VehicleDataNotificationStatus enumNotSupported = VehicleDataNotificationStatus.valueForString(example);
@@ -26,6 +33,9 @@ public class VehicleDataNotificationStatusTests extends TestCase {
 		assertNotNull("NOT_USED returned null", enumNotUsed);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "nOT_SuppOrTEd";
 		try {
@@ -37,6 +47,9 @@ public class VehicleDataNotificationStatusTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -48,6 +61,9 @@ public class VehicleDataNotificationStatusTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of VehicleDataNotification.
+	 */
 	public void testListEnum() {
  		List<VehicleDataNotificationStatus> enumValueList = Arrays.asList(VehicleDataNotificationStatus.values());
 
@@ -59,6 +75,5 @@ public class VehicleDataNotificationStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
index e59dbefcb..2f7ea567d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VehicleDataResultCode}
+ */
 public class VehicleDataResultCodeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "SUCCESS";
 		VehicleDataResultCode enumSuccess = VehicleDataResultCode.valueForString(example);
@@ -38,6 +45,9 @@ public class VehicleDataResultCodeTests extends TestCase {
 		assertNotNull("IGNORED returned null", enumIgnored);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "suCcesS";
 		try {
@@ -49,6 +59,9 @@ public class VehicleDataResultCodeTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -60,6 +73,9 @@ public class VehicleDataResultCodeTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of VehicleDataResultCode.
+	 */
 	public void testListEnum() {
  		List<VehicleDataResultCode> enumValueList = Arrays.asList(VehicleDataResultCode.values());
 
@@ -75,6 +91,5 @@ public class VehicleDataResultCodeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
index 2214f3870..d35780ff4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VehicleDataStatus}
+ */
 public class VehicleDataStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "NO_DATA_EXISTS";
 		VehicleDataStatus enumNoDataExists = VehicleDataStatus.valueForString(example);
@@ -23,6 +30,9 @@ public class VehicleDataStatusTests extends TestCase {
 		assertNotNull("ON returned null", enumOn);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "No_DatA_ExiSTs";
 		try {
@@ -34,6 +44,9 @@ public class VehicleDataStatusTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -45,6 +58,9 @@ public class VehicleDataStatusTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of VehicleDataStatus.
+	 */
 	public void testListEnum() {
  		List<VehicleDataStatus> enumValueList = Arrays.asList(VehicleDataStatus.values());
 
@@ -55,6 +71,5 @@ public class VehicleDataStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
index 535be355b..7490940fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataType;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VehicleData}
+ */
 public class VehicleDataTypeTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "VEHICLEDATA_GPS";
 		VehicleDataType enumVehicleDataGps = VehicleDataType.valueForString(example);
@@ -92,6 +99,9 @@ public class VehicleDataTypeTests extends TestCase {
 		assertNotNull("VEHICLEDATA_MYKEY returned null", enumVehicleDataMyKey);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "VeHIcLEDatA_GPs";
 		try {
@@ -103,6 +113,9 @@ public class VehicleDataTypeTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -114,6 +127,9 @@ public class VehicleDataTypeTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of VehicleDataType.
+	 */
 	public void testListEnum() {
  		List<VehicleDataType> enumValueList = Arrays.asList(VehicleDataType.values());
 
@@ -147,6 +163,5 @@ public class VehicleDataTypeTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
index ac3a1e7c6..33da334b8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.VrCapabilities;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.VrCapabilities}
+ */
 public class VrCapabilitiesTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "Text";
 		VrCapabilities enumText = VrCapabilities.valueForString(example);
@@ -17,6 +24,9 @@ public class VrCapabilitiesTests extends TestCase {
 		assertNotNull("Text returned null", enumText);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "tExTx";
 		try {
@@ -26,8 +36,11 @@ public class VrCapabilitiesTests extends TestCase {
 		catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
 		}
-	}
+	}	
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -39,6 +52,9 @@ public class VrCapabilitiesTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of VrCapabilities.
+	 */
 	@SuppressWarnings("deprecation")
 	public void testListEnum() {
  		List<VrCapabilities> enumValueList = Arrays.asList(VrCapabilities.values());
@@ -49,6 +65,5 @@ public class VrCapabilitiesTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
index 2d6e11835..18c6cc046 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.WarningLightStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.WarningListStatus}
+ */
 public class WarningLightStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "OFF";
 		WarningLightStatus enumOff = WarningLightStatus.valueForString(example);
@@ -26,6 +33,9 @@ public class WarningLightStatusTests extends TestCase {
 		assertNotNull("NOT_USED returned null", enumNotUsed);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "OfF";
 		try {
@@ -37,6 +47,9 @@ public class WarningLightStatusTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -48,6 +61,9 @@ public class WarningLightStatusTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of WarningLightStatus.
+	 */
 	public void testListEnum() {
  		List<WarningLightStatus> enumValueList = Arrays.asList(WarningLightStatus.values());
 
@@ -59,6 +75,5 @@ public class WarningLightStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
index f3273ccf1..1ab3370fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
@@ -8,8 +8,15 @@ import junit.framework.TestCase;
 
 import com.smartdevicelink.proxy.rpc.enums.WiperStatus;
 
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.rpc.enums.WiperStatis}
+ */
 public class WiperStatusTests extends TestCase {
 
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
 	public void testValidEnums () {	
 		String example = "OFF";
 		WiperStatus enumOff = WiperStatus.valueForString(example);
@@ -59,6 +66,9 @@ public class WiperStatusTests extends TestCase {
 		assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists);
 	}
 	
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
 	public void testInvalidEnum () {
 		String example = "OFf";
 		try {
@@ -70,6 +80,9 @@ public class WiperStatusTests extends TestCase {
 		}
 	}
 	
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
 	public void testNullEnum () {
 		String example = null;
 		try {
@@ -81,6 +94,9 @@ public class WiperStatusTests extends TestCase {
 		}
 	}	
 	
+	/**
+	 * Verifies the possible enum values of WiperStatus.
+	 */
 	public void testListEnum() {
  		List<WiperStatus> enumValueList = Arrays.asList(WiperStatus.values());
 
@@ -103,6 +119,5 @@ public class WiperStatusTests extends TestCase {
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-}
+	}	
+}
\ No newline at end of file